Skip to content

Commit d0f9346

Browse files
committed
[SourceKit] Change rename-mismatch to define input spec and expected output inline with the test file
1 parent 4c1d875 commit d0f9346

File tree

3 files changed

+47
-40
lines changed

3 files changed

+47
-40
lines changed

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

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

test/SourceKit/Refactoring/find-rename-ranges/rename-mismatch.in.json

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,57 @@
1+
// RUN: %empty-directory(%t)
2+
// RUN: split-file --leading-lines %s %t
3+
4+
//--- input.swift
15
struct Sss {
26
}
37

48
_ = Mismatch()
59
// Mismatch()
610
_ = Sss()
711

12+
//--- dummy.txt
813
// RUN: %empty-directory(%t.result)
9-
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/rename-mismatch.in.json %s >> %t.result/rename-mismatch.expected
10-
// RUN: %diff -u %S/find-rename-ranges/rename-mismatch.expected %t.result/rename-mismatch.expected
14+
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %t/rename-spec.json %t/input.swift | %FileCheck %s
1115

1216
// RUN: %empty-directory(%t.ranges)
13-
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/find-rename-ranges/rename-mismatch.in.json %s >> %t.ranges/rename-mismatch.expected
14-
// RUN: %diff -u %S/find-rename-ranges/rename-mismatch.expected %t.ranges/rename-mismatch.expected
17+
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %t/rename-spec.json %t/input.swift | %FileCheck %s
18+
19+
// CHECK: source.edit.kind.active:
20+
// CHECK: 5:8-5:11 source.refactoring.range.kind.basename
21+
// CHECK: source.edit.kind.unknown:
22+
// CHECK: source.edit.kind.mismatch:
23+
// CHECK: source.edit.kind.active:
24+
// CHECK: 10:5-10:8 source.refactoring.range.kind.basename
25+
26+
//--- rename-spec.json
27+
28+
[
29+
{
30+
"key.name": "Sss",
31+
"key.newname": "Ttt",
32+
"key.is_function_like": 0,
33+
"key.is_non_protocol_type": 1,
34+
"key.locations": [
35+
{
36+
"key.line": 5,
37+
"key.column": 8,
38+
"key.nametype": source.syntacticrename.definition
39+
},
40+
{
41+
"key.line": 8,
42+
"key.column": 5,
43+
"key.nametype": source.syntacticrename.unknown
44+
},
45+
{
46+
"key.line": 9,
47+
"key.column": 5,
48+
"key.nametype": source.syntacticrename.unknown
49+
},
50+
{
51+
"key.line": 10,
52+
"key.column": 5,
53+
"key.nametype": source.syntacticrename.reference
54+
}
55+
]
56+
}
57+
]

0 commit comments

Comments
 (0)