Merge pull request #69784 from ahoppen/ahoppen/remove-syntacticrename

Remove the `source.request.syntacticrename` request

Author: ahoppen

test/SourceKit/Refactoring/syntactic-rename.swift renamed to test/SourceKit/Refactoring/find-rename-ranges.swift

@@ -120,57 +120,38 @@ struct Foo {
 // RUN: %empty-directory(%t.result)
 
 // Ensure that a syntactic rename request does not require the stdlib
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/empty.json %s -- -resource-dir /no/stdlib/here
-
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/x.in.json %s >> %t.result/x.expected
-// RUN: %diff -u %S/syntactic-rename/x.expected %t.result/x.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/empty.json %s -- -resource-dir /no/stdlib/here
 
 // Note: Even though the #if is true, it is not evaluated since we only parse.
 // Thus, both the #if and #else are inactive
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/z.in.json %s >> %t.result/z.expected
-// RUN: %diff -u %S/syntactic-rename/z.expected %t.result/z.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/foo.in.json %s >> %t.result/foo_arity1.expected
-// RUN: %diff -u %S/syntactic-rename/foo_arity1.expected %t.result/foo_arity1.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/foo_remove.in.json %s >> %t.result/foo_remove.expected
-// RUN: %diff -u %S/syntactic-rename/foo_remove.expected %t.result/foo_remove.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/bar.in.json %s >> %t.result/bar.expected
-// RUN: %diff -u %S/syntactic-rename/bar.expected %t.result/bar.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/bar_add_param.in.json %s >> %t.result/bar_add_param.expected
-// RUN: %diff -u %S/syntactic-rename/bar_add_param.expected %t.result/bar_add_param.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/bar_drop_param.in.json %s >> %t.result/bar_drop_param.expected
-// RUN: %diff -u %S/syntactic-rename/bar_drop_param.expected %t.result/bar_drop_param.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/comment.in.json %s >> %t.result/comment.expected
-// RUN: %diff -u %S/syntactic-rename/comment.expected %t.result/comment.expected
-// RUN: not %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/invalid.in.json %s
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/rename-memberwise.in.json %s >> %t.result/rename-memberwise.expected
-// RUN: %diff -u %S/syntactic-rename/rename-memberwise.expected %t.result/rename-memberwise.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/rename-layer.in.json %s >> %t.result/rename-layer.expected
-// RUN: %diff -u %S/syntactic-rename/rename-layer.expected %t.result/rename-layer.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/rename-P.in.json %s >> %t.result/rename-P.expected
-// RUN: %diff -u %S/syntactic-rename/rename-P.expected %t.result/rename-P.expected
-// RUN: %sourcekitd-test -req=syntactic-rename -rename-spec %S/syntactic-rename/keywordbase.in.json %s >> %t.result/keywordbase.expected
-// RUN: %diff -u %S/syntactic-rename/keywordbase.expected %t.result/keywordbase.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/foo_remove.in.json %s >> %t.result/foo_remove.expected
+// RUN: %diff -u %S/find-rename-ranges/foo_remove.expected %t.result/foo_remove.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/bar_add_param.in.json %s >> %t.result/bar_add_param.expected
+// RUN: %diff -u %S/find-rename-ranges/bar_add_param.expected %t.result/bar_add_param.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/bar_drop_param.in.json %s >> %t.result/bar_drop_param.expected
+// RUN: %diff -u %S/find-rename-ranges/bar_drop_param.expected %t.result/bar_drop_param.expected
+// RUN2: not %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/invalid.in.json %s
 
 // RUN: %empty-directory(%t.ranges)
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/x.in.json %s >> %t.ranges/x.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/x.in.json %s >> %t.ranges/x.expected
 // RUN: %diff -u %S/find-rename-ranges/x.expected %t.ranges/x.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/z.in.json %s >> %t.ranges/z.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/z.in.json %s >> %t.ranges/z.expected
 // RUN: %diff -u %S/find-rename-ranges/z.expected %t.ranges/z.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/foo.in.json %s >> %t.ranges/foo_arity1.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/foo.in.json %s >> %t.ranges/foo_arity1.expected
 // RUN: %diff -u %S/find-rename-ranges/foo_arity1.expected %t.ranges/foo_arity1.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/bar.in.json %s >> %t.ranges/bar.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/bar.in.json %s >> %t.ranges/bar.expected
 // RUN: %diff -u %S/find-rename-ranges/bar.expected %t.ranges/bar.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/comment.in.json %s >> %t.ranges/comment.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/comment.in.json %s >> %t.ranges/comment.expected
 // RUN: %diff -u %S/find-rename-ranges/comment.expected %t.ranges/comment.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/init.in.json %s >> %t.ranges/init.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/init.in.json %s >> %t.ranges/init.expected
 // RUN: %diff -u %S/find-rename-ranges/init.expected %t.ranges/init.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/enum_case.in.json %s >> %t.result/enum_case.expected
-// RUN: %diff -u %S/syntactic-rename/enum_case.expected %t.result/enum_case.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/rename-memberwise.in.json %s >> %t.ranges/rename-memberwise.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/enum_case.in.json %s >> %t.result/enum_case.expected
+// RUN: %diff -u %S/find-rename-ranges/enum_case.expected %t.result/enum_case.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/rename-memberwise.in.json %s >> %t.ranges/rename-memberwise.expected
 // RUN: %diff -u %S/find-rename-ranges/rename-memberwise.expected %t.ranges/rename-memberwise.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/rename-layer.in.json %s >> %t.ranges/rename-layer.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/rename-layer.in.json %s >> %t.ranges/rename-layer.expected
 // RUN: %diff -u %S/find-rename-ranges/rename-layer.expected %t.ranges/rename-layer.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/rename-P.in.json %s -- -swift-version 4 >> %t.ranges/rename-P.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/rename-P.in.json %s -- -swift-version 4 >> %t.ranges/rename-P.expected
 // RUN: %diff -u %S/find-rename-ranges/rename-P.expected %t.ranges/rename-P.expected
-// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/syntactic-rename/keywordbase.in.json %s -- -swift-version 4 >> %t.ranges/keywordbase.expected
+// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/keywordbase.in.json %s -- -swift-version 4 >> %t.ranges/keywordbase.expected
 // RUN: %diff -u %S/find-rename-ranges/keywordbase.expected %t.ranges/keywordbase.expected

test/SourceKit/Refactoring/syntactic-rename/bar.in.json renamed to test/SourceKit/Refactoring/find-rename-ranges/bar.in.json

@@ -0,0 +1,18 @@
+source.edit.kind.active:
+  29:1-29:4 source.refactoring.range.kind.basename
+  29:5-29:6 source.refactoring.range.kind.call-argument-label arg-index=0
+  29:6-29:8 source.refactoring.range.kind.call-argument-colon arg-index=0
+  29:11-29:12 source.refactoring.range.kind.call-argument-label arg-index=1
+  29:12-29:14 source.refactoring.range.kind.call-argument-colon arg-index=1
+  29:17-29:17 source.refactoring.range.kind.call-argument-combined arg-index=2
+  29:20-29:20 source.refactoring.range.kind.call-argument-combined arg-index=3
+source.edit.kind.active:
+  28:6-28:9 source.refactoring.range.kind.basename
+  28:10-28:11 source.refactoring.range.kind.decl-argument-label arg-index=0
+  28:11-28:11 source.refactoring.range.kind.parameter-and-whitespace arg-index=0
+  28:33-28:34 source.refactoring.range.kind.decl-argument-label arg-index=1
+  28:34-28:36 source.refactoring.range.kind.parameter-and-whitespace arg-index=1
+  28:43-28:44 source.refactoring.range.kind.decl-argument-label arg-index=2
+  28:44-28:44 source.refactoring.range.kind.parameter-and-whitespace arg-index=2
+  28:51-28:52 source.refactoring.range.kind.decl-argument-label arg-index=3
+  28:52-28:54 source.refactoring.range.kind.parameter-and-whitespace arg-index=3

test/SourceKit/Refactoring/find-rename-ranges/bar_add_param.expected

@@ -0,0 +1,18 @@
+source.edit.kind.active:
+  29:1-29:4 source.refactoring.range.kind.basename
+  29:5-29:6 source.refactoring.range.kind.call-argument-label arg-index=0
+  29:6-29:8 source.refactoring.range.kind.call-argument-colon arg-index=0
+  29:11-29:12 source.refactoring.range.kind.call-argument-label arg-index=1
+  29:12-29:14 source.refactoring.range.kind.call-argument-colon arg-index=1
+  29:17-29:17 source.refactoring.range.kind.call-argument-combined arg-index=2
+  29:20-29:20 source.refactoring.range.kind.call-argument-combined arg-index=3
+source.edit.kind.active:
+  28:6-28:9 source.refactoring.range.kind.basename
+  28:10-28:11 source.refactoring.range.kind.decl-argument-label arg-index=0
+  28:11-28:11 source.refactoring.range.kind.parameter-and-whitespace arg-index=0
+  28:33-28:34 source.refactoring.range.kind.decl-argument-label arg-index=1
+  28:34-28:36 source.refactoring.range.kind.parameter-and-whitespace arg-index=1
+  28:43-28:44 source.refactoring.range.kind.decl-argument-label arg-index=2
+  28:44-28:44 source.refactoring.range.kind.parameter-and-whitespace arg-index=2
+  28:51-28:52 source.refactoring.range.kind.decl-argument-label arg-index=3
+  28:52-28:54 source.refactoring.range.kind.parameter-and-whitespace arg-index=3