Merge pull request #69872 from ahoppen/ahoppen/migrate-rename-tests

[SourceKit] Migrate rename test to only check rename ranges and not the application of the rename

Author: ahoppen

test/SourceKit/Refactoring/semantic-refactoring/line-col-conversion.swift

@@ -1,4 +1,7 @@
-// RUN: %sourcekitd-test -req=refactoring.rename.local -pos=4:7 -name new_name %s -- %s
+// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=4:7 %s -- %s | %FileCheck %s
 
 var Foo: Int {
 	var missingNewlineAtEndOfFile
+
+// CHECK: source.edit.kind.active:
+// CHECK:   4:6-4:31 source.refactoring.range.kind.basename

test/SourceKit/Refactoring/semantic-refactoring/local-rename.swift

@@ -12,11 +12,24 @@ func foo() {
 }
 
 // RUN: %empty-directory(%t.result)
-// RUN: %sourcekitd-test -req=refactoring.rename.local -pos=2:8 -name new_name %s -- %s > %t.result/local-rename.swift.expected
-// RUN: %diff -u %S/local-rename.swift.expected %t.result/local-rename.swift.expected
-// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=2:8 %s -- %s > %t.result/local-rename-ranges.swift.expected
-// RUN: %diff -u %S/local-rename-ranges.swift.expected %t.result/local-rename-ranges.swift.expected
-// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=7:11 %s -- %s > %t.result/local-rename-lazy.swift.expected
-// RUN: %diff -u %S/local-rename-lazy.swift.expected %t.result/local-rename-lazy.swift.expected
+// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=2:8 %s -- %s | %FileCheck %s --check-prefix CHECK-aa
+
+// CHECK-aa: source.edit.kind.active:
+// CHECK-aa-NEXT:   2:7-2:9 source.refactoring.range.kind.basename
+// CHECK-aa-NEXT: source.edit.kind.active:
+// CHECK-aa-NEXT:   3:3-3:5 source.refactoring.range.kind.basename
+// CHECK-aa-NEXT: source.edit.kind.active:
+// CHECK-aa-NEXT:   3:8-3:10 source.refactoring.range.kind.basename
+// CHECK-aa-NEXT: source.edit.kind.active:
+// CHECK-aa-NEXT:   4:17-4:19 source.refactoring.range.kind.basename
+
+
+// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=7:11 %s -- %s | %FileCheck %s --check-prefix CHECK-myVal
+
+// CHECK-myVal: source.edit.kind.active:
+// CHECK-myVal-NEXT:   7:11-7:16 source.refactoring.range.kind.basename
+// CHECK-myVal-NEXT: source.edit.kind.active:
+// CHECK-myVal-NEXT:   8:14-8:19 source.refactoring.range.kind.basename
+
 
 // REQUIRES: OS=macosx || OS=linux-gnu