Skip to content

Commit 5ed83ff

Browse files
committed
[SourceKit] Update tests to use find-local-rename-ranges instead of invoking the local rename refactoring action
The local rename refactoring action will be removed in a follow-up commit.
1 parent 9ccb2ef commit 5ed83ff

34 files changed

+113
-426
lines changed
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// RUN: %sourcekitd-test -req=refactoring.rename.local -pos=4:7 -name new_name %s -- %s
1+
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=4:7 %s -- %s | %FileCheck %s
22

33
var Foo: Int {
44
var missingNewlineAtEndOfFile
5+
6+
// CHECK: source.edit.kind.active:
7+
// CHECK: 4:6-4:31 source.refactoring.range.kind.basename

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,24 @@ func foo() {
1212
}
1313

1414
// RUN: %empty-directory(%t.result)
15-
// RUN: %sourcekitd-test -req=refactoring.rename.local -pos=2:8 -name new_name %s -- %s > %t.result/local-rename.swift.expected
16-
// RUN: %diff -u %S/local-rename.swift.expected %t.result/local-rename.swift.expected
17-
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=2:8 %s -- %s > %t.result/local-rename-ranges.swift.expected
18-
// RUN: %diff -u %S/local-rename-ranges.swift.expected %t.result/local-rename-ranges.swift.expected
19-
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=7:11 %s -- %s > %t.result/local-rename-lazy.swift.expected
20-
// RUN: %diff -u %S/local-rename-lazy.swift.expected %t.result/local-rename-lazy.swift.expected
15+
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=2:8 %s -- %s | %FileCheck %s --check-prefix CHECK-aa
16+
17+
// CHECK-aa: source.edit.kind.active:
18+
// CHECK-aa-NEXT: 2:7-2:9 source.refactoring.range.kind.basename
19+
// CHECK-aa-NEXT: source.edit.kind.active:
20+
// CHECK-aa-NEXT: 3:3-3:5 source.refactoring.range.kind.basename
21+
// CHECK-aa-NEXT: source.edit.kind.active:
22+
// CHECK-aa-NEXT: 3:8-3:10 source.refactoring.range.kind.basename
23+
// CHECK-aa-NEXT: source.edit.kind.active:
24+
// CHECK-aa-NEXT: 4:17-4:19 source.refactoring.range.kind.basename
25+
26+
27+
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=7:11 %s -- %s | %FileCheck %s --check-prefix CHECK-myVal
28+
29+
// CHECK-myVal: source.edit.kind.active:
30+
// CHECK-myVal-NEXT: 7:11-7:16 source.refactoring.range.kind.basename
31+
// CHECK-myVal-NEXT: source.edit.kind.active:
32+
// CHECK-myVal-NEXT: 8:14-8:19 source.refactoring.range.kind.basename
33+
2134

2235
// REQUIRES: OS=macosx || OS=linux-gnu

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/C1.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/E1.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/S1.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/SLocal.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/SLocal_init.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/SP1.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/refactoring/rename/Outputs/basic/foo4.swift.expected

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)