Skip to content

Commit a710111

Browse files
ahoppenahoppen
committed
[SourceKit] Support building sourcekitd without building swift-syntax
This allows building sourcekitd and swift-refactor with `SWIFT_BUILD_SWIFT_SYNTAX=NO`. In these builds, the `relatedidents` and `find-syntactic-rename-ranges` requests will always return an error.
1 parent 556c503 commit a710111

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+90
-23
lines changed

‎include/swift/Refactoring/Refactoring.h

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class RenameLocs {
100100
/// - valueDecl: The declaration that should be renamed
101101
RenameLocs localRenameLocs(SourceFile *sourceFile, const ValueDecl *valueDecl);
102102

103+
#if SWIFT_BUILD_SWIFT_SYNTAX
103104
/// Given a list of `RenameLoc`s, get the corresponding `ResolveLoc`s.
104105
///
105106
/// These resolve locations contain more structured information, such as the
@@ -112,6 +113,7 @@ std::vector<ResolvedLoc> resolveRenameLocations(ArrayRef<RenameLoc> renameLocs,
112113
StringRef newName,
113114
SourceFile &sourceFile,
114115
DiagnosticEngine &diags);
116+
#endif
115117

116118
struct RangeConfig {
117119
unsigned BufferID;

‎lib/IDE/Utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@ class ClangFileRewriterHelper {
808808
getBuffer());
809809
RewriteBuf.Initialize(Input);
810810
removeCommentLines(RewriteBuf, Input, "RUN");
811+
removeCommentLines(RewriteBuf, Input, "REQUIRES");
811812
removeCommentLines(RewriteBuf, Input, "CHECK");
812813
}
813814

‎lib/Refactoring/CMakeLists.txt

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
if (NOT SWIFT_BUILD_SWIFT_SYNTAX)
2-
# swiftRefactoring requires SwiftIDEUtilsBriding, which isn't built if SWIFT_BUILD_SWIFT_SYNTAX is `NO`.
3-
return()
4-
endif()
5-
61
add_swift_host_library(swiftRefactoring STATIC
72
AddEquatableConformance.cpp
83
AddExplicitCodableImplementation.cpp
@@ -55,5 +50,11 @@ target_link_libraries(swiftRefactoring PRIVATE
5550
swiftParse
5651
swiftSema)
5752

58-
set_swift_llvm_is_available(swiftRefactoring)
53+
if(SWIFT_BUILD_SWIFT_SYNTAX)
54+
target_compile_definitions(swiftRefactoring
55+
PRIVATE
56+
SWIFT_BUILD_SWIFT_SYNTAX
57+
)
58+
endif()
5959

60+
set_swift_llvm_is_available(swiftRefactoring)

‎lib/Refactoring/SyntacticRename.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using namespace swift;
2222
using namespace swift::ide;
2323

24+
#if SWIFT_BUILD_SWIFT_SYNTAX
2425
std::vector<ResolvedLoc>
2526
swift::ide::resolveRenameLocations(ArrayRef<RenameLoc> RenameLocs,
2627
StringRef NewName, SourceFile &SF,
@@ -105,13 +106,17 @@ swift::ide::resolveRenameLocations(ArrayRef<RenameLoc> RenameLocs,
105106
}
106107
return resolvedLocsInRequestedOrder;
107108
}
109+
#endif
108110

109111
CancellableResult<std::vector<SyntacticRenameRangeDetails>>
110112
swift::ide::findSyntacticRenameRanges(SourceFile *SF,
111113
ArrayRef<RenameLoc> RenameLocs,
112114
StringRef NewName) {
113115
using ResultType =
114116
CancellableResult<std::vector<SyntacticRenameRangeDetails>>;
117+
#if !SWIFT_BUILD_SWIFT_SYNTAX
118+
return ResultType::failure("find-syntactic-rename-ranges is not supported because sourcekitd was built without swift-syntax");
119+
#else
115120
assert(SF && "null source file");
116121

117122
SourceManager &SM = SF->getASTContext().SourceMgr;
@@ -146,4 +151,5 @@ swift::ide::findSyntacticRenameRanges(SourceFile *SF,
146151
return ResultType::failure(ErrBuffer);
147152

148153
return ResultType::success(Result);
154+
#endif
149155
}

‎test/SourceKit/CursorInfo/cursor_callargs.swift

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class C1 {
66
var c1 = C1(passInt: 0, andThis: 0)
77
c1.meth(0, passFloat: 0)
88

9+
// REQUIRES: swift_swift_parser
910
// RUN: %sourcekitd-test -req=cursor -pos=6:11 %s -- %s | %FileCheck -check-prefix=CHECK-CLASS %s
1011
// CHECK-CLASS: source.lang.swift.ref.class (2:7-2:9)
1112
// CHECK-CLASS: s:15cursor_callargs2C1C

‎test/SourceKit/Misc/stats.swift

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
func foo() {}
22

3+
// REQUIRES: swift_swift_parser
34
// RUN: %sourcekitd-test -req=syntax-map %s == -req=stats | %FileCheck %s -check-prefix=SYNTAX_1
45

56
// SYNTAX_1: {{.*}} source.statistic.instruction-count

‎test/SourceKit/Refactoring/find-rename-ranges.swift

+2
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ struct Foo {
117117
static var test: Int = 10
118118
}
119119

120+
// REQUIRES: swift_swift_parser
121+
120122
// RUN: %empty-directory(%t.result)
121123

122124
// Ensure that a syntactic rename request does not require the stdlib

‎test/SourceKit/Refactoring/ordering.swift

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func test(c: C) {
3535
/*C_foo3_call_arg2*/b: 2)
3636
}
3737

38+
// REQUIRES: swift_swift_parser
3839
// RUN: %empty-directory(%t.result)
3940
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %S/ordering/ordering.in.json %s >> %t.result/ordering.expected
4041
// RUN: %diff -u %S/ordering/ordering.expected %t.result/ordering.expected

‎test/SourceKit/Refactoring/rename-mismatch.swift

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: %empty-directory(%t)
23
// RUN: split-file --leading-lines %s %t
34

@@ -17,11 +18,11 @@ _ = Sss()
1718
// RUN: %sourcekitd-test -req=find-rename-ranges -rename-spec %t/rename-spec.json %t/input.swift | %FileCheck %s
1819

1920
// CHECK: source.edit.kind.active:
20-
// CHECK: 5:8-5:11 source.refactoring.range.kind.basename
21+
// CHECK: 6:8-6:11 source.refactoring.range.kind.basename
2122
// CHECK: source.edit.kind.unknown:
2223
// CHECK: source.edit.kind.mismatch:
2324
// CHECK: source.edit.kind.active:
24-
// CHECK: 10:5-10:8 source.refactoring.range.kind.basename
25+
// CHECK: 11:5-11:8 source.refactoring.range.kind.basename
2526

2627
//--- rename-spec.json
2728

@@ -33,22 +34,22 @@ _ = Sss()
3334
"key.is_non_protocol_type": 1,
3435
"key.locations": [
3536
{
36-
"key.line": 5,
37+
"key.line": 6,
3738
"key.column": 8,
3839
"key.nametype": source.syntacticrename.definition
3940
},
4041
{
41-
"key.line": 8,
42+
"key.line": 9,
4243
"key.column": 5,
4344
"key.nametype": source.syntacticrename.unknown
4445
},
4546
{
46-
"key.line": 9,
47+
"key.line": 10,
4748
"key.column": 5,
4849
"key.nametype": source.syntacticrename.unknown
4950
},
5051
{
51-
"key.line": 10,
52+
"key.line": 11,
5253
"key.column": 5,
5354
"key.nametype": source.syntacticrename.reference
5455
}

‎test/SourceKit/Refactoring/rename-with-location-directive.swift

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
func test() {}
33
#sourceLocation()
44

5+
// REQUIRES: swift_swift_parser
56
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=2:6 %s -- %s | %FileCheck %s
67
// CHECK: 2:6-2:10 source.refactoring.range.kind.basename

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=4:7 %s -- %s | %FileCheck %s
1+
// REQUIRES: swift_swift_parser
2+
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=5:7 %s -- %s | %FileCheck %s
23

34
var Foo: Int {
45
var missingNewlineAtEndOfFile
56

67
// CHECK: source.edit.kind.active:
7-
// CHECK: 4:6-4:31 source.refactoring.range.kind.basename
8+
// CHECK: 5:6-5:31 source.refactoring.range.kind.basename

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

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ func foo() {
1111
return 1
1212
}
1313

14+
// REQUIRES: swift_swift_parser
1415
// RUN: %empty-directory(%t.result)
1516
// RUN: %sourcekitd-test -req=find-local-rename-ranges -pos=2:8 %s -- %s | %FileCheck %s --check-prefix CHECK-aa
1617

‎test/SourceKit/RelatedIdents/implicit_vis.swift

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class B {
1616

1717
//--- dummy.swift
1818

19+
// REQUIRES: swift_swift_parser
1920
// RUN: %sourcekitd-test -req=related-idents -pos=3:10 %t/a.swift -- %t/a.swift %t/b.swift -o implicit_vis.o | %FileCheck -check-prefix=CHECK1 %s
2021

2122
// CHECK1: START RANGES

‎test/SourceKit/RelatedIdents/invalid_loc.swift

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: %sourcekitd-test -req=related-idents -pos=%(line + 1):1 %s -- %s | %FileCheck %s
23

34
// CHECK: START RANGES

‎test/SourceKit/RelatedIdents/multiple_occurrences_on_same_line.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: %sourcekitd-test -req=related-idents -pos=%(line + 1):5 %s -- %s | %FileCheck %s
23
let asd = [0]
34
let index = asd.firstIndex(of: 0)!
45
print(asd[asd.firstIndex(of: 0)!...])
56

67

78
// CHECK: START RANGES
8-
// CHECK: 2:5 - 3
9-
// CHECK: 3:13 - 3
10-
// CHECK: 4:7 - 3
11-
// CHECK: 4:11 - 3
9+
// CHECK: 3:5 - 3
10+
// CHECK: 4:13 - 3
11+
// CHECK: 5:7 - 3
12+
// CHECK: 5:11 - 3
1213
// CHECK: END RANGES
1314

‎test/SourceKit/RelatedIdents/pound_if.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: %sourcekitd-test -req=related-idents -pos=%(line + 1):10 %s -- %s | %FileCheck %s
23
func foo(x: Int) {
34
#if true
@@ -8,6 +9,6 @@ func foo(x: Int) {
89
}
910

1011
// CHECK: START RANGES
11-
// CHECK-NEXT: 2:10 - 1
12-
// CHECK-NEXT: 4:9 - 1
12+
// CHECK-NEXT: 3:10 - 1
13+
// CHECK-NEXT: 5:9 - 1
1314
// CHECK-NEXT: END RANGES

‎test/SourceKit/RelatedIdents/related_idents.swift

+2
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ func ifLet(test: Int?) {
105105
}
106106
}
107107

108+
// REQUIRES: swift_swift_parser
109+
108110
// RUN: %sourcekitd-test -req=related-idents -pos=6:17 %s -- -module-name related_idents %s | %FileCheck -check-prefix=CHECK1 %s
109111
// CHECK1: START RANGES
110112
// CHECK1-NEXT: 1:7 - 2

‎test/SourceKit/RelatedIdents/system_symbol.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: %sourcekitd-test -req=related-idents -pos=%(line + 1):13 %s -- %s | %FileCheck %s
23
func foo(x: String) {
34
let a: String = "abc"
45
}
56

67
// CHECK: START RANGES
7-
// CHECK-NEXT: 2:13 - 6
8-
// CHECK-NEXT: 3:10 - 6
8+
// CHECK-NEXT: 3:13 - 6
9+
// CHECK-NEXT: 4:10 - 6
910
// CHECK-NEXT: END RANGES

‎test/refactoring/SyntacticRename/backticks-noncollapsible-separate-arglabel.swift

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ struct Foo {
33
}
44
Foo()/*test:ref*/[`x`: 10]
55

6+
// REQUIRES: swift_swift_parser
67
// RUN: %empty-directory(%t.ranges)
78
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "subscript(x:)" >> %t.ranges/backticks-noncollapsible-separate-arglabel.swift.expected
89
// RUN: diff -u %S/Outputs/backticks-noncollapsible-separate-arglabel.swift.expected %t.ranges/backticks-noncollapsible-separate-arglabel.swift.expected

‎test/refactoring/SyntacticRename/backticks-noncollapsible.swift

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ struct Foo {
33
}
44
Foo()/*test:ref*/[10]
55

6+
// REQUIRES: swift_swift_parser
67
// RUN: %empty-directory(%t.ranges)
78
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "subscript(_:)" >> %t.ranges/backticks-noncollapsible.swift.expected
89
// RUN: diff -u %S/Outputs/backticks-noncollapsible.swift.expected %t.ranges/backticks-noncollapsible.swift.expected

‎test/refactoring/SyntacticRename/backticks-separate-arglabel.swift

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ func /*test:def*/`foo`(`x` `y`: Int) {}
22
/*test:call*/`foo`(`x`: 2)
33
_ = /*test:ref*/`foo`(`x`:)
44

5+
// REQUIRES: swift_swift_parser
56
// RUN: %empty-directory(%t.ranges)
67
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "foo(x:)" >> %t.ranges/backticks-separate-arglabel.swift.expected
78
// RUN: diff -u %S/Outputs/backticks-separate-arglabel.swift.expected %t.ranges/backticks-separate-arglabel.swift.expected

‎test/refactoring/SyntacticRename/backticks.swift

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ func /*test:def*/`foo`(`x`: Int) {}
22
/*test:call*/`foo`(`x`: 2)
33
_ = /*test:ref*/`foo`(`x`:)
44

5+
// REQUIRES: swift_swift_parser
56
// RUN: %empty-directory(%t.ranges)
67
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "foo(x:)" >> %t.ranges/backticks.swift.expected
78
// RUN: diff -u %S/Outputs/backticks.swift.expected %t.ranges/backticks.swift.expected

‎test/refactoring/SyntacticRename/call-as-function-base.swift

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ let /*test:def*/add3 = Adder(base: 3)
1010
/*test:ref*/add3(x: 10, y: 11)
1111
let blah = /*test:ref*/add3.callAsFunction(x:y:)
1212

13+
// REQUIRES: swift_swift_parser
1314
// RUN: %empty-directory(%t.ranges)
1415
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -old-name "add3" >> %t.ranges/call-as-function-base.swift.expected
1516
// RUN: diff -u %S/Outputs/call-as-function-base.swift.expected %t.ranges/call-as-function-base.swift.expected

‎test/refactoring/SyntacticRename/call-as-function-paren-arg.swift

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ _ = add3 . /*test:call*/callAsFunction(10)
1111
_ = add3 . /*test:ref*/callAsFunction(_:)
1212
_ = add3 . /*test:ref*/callAsFunction
1313

14+
// REQUIRES: swift_swift_parser
1415
// RUN: %empty-directory(%t.ranges)
1516
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "callAsFunction(_:)" >> %t.ranges/call-as-function-paren-arg.swift.expected
1617
// RUN: diff -u %S/Outputs/call-as-function-paren-arg.swift.expected %t.ranges/call-as-function-paren-arg.swift.expected

‎test/refactoring/SyntacticRename/call-as-function.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ _ = add3 . /*test:ref*/callAsFunction(x:y:)
1212
_ = add3 . /*test:ref*/callAsFunction
1313
_ = (add3 . /*test:call*/callAsFunction())/*test:call*/(x: 10, y: 11)
1414

15+
// REQUIRES: swift_swift_parser
1516
// RUN: %empty-directory(%t.ranges)
1617
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "callAsFunction(x:y:)" >> %t.ranges/call-as-function.swift.expected
1718
// RUN: diff -u %S/Outputs/call-as-function.swift.expected %t.ranges/call-as-function.swift.expected

‎test/refactoring/SyntacticRename/callsites.swift

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ func /*mixed:def*/withAllOfTheAbove(x: Int = 2, _: Int..., z: Int = 2, c: () ->
6767
// false positives
6868
/*mixed:call*/withAllOfTheAbove(z: 1, 2, c: {return 1})
6969

70+
// REQUIRES: swift_swift_parser
7071
// RUN: %empty-directory(%t.result)
7172
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="defaults" -is-function-like -old-name "withDefaults(_:y:x:)" -new-name "betterName(x:y:z:)" >> %t.result/callsites_defaults.swift
7273
// RUN: diff -u %S/Outputs/callsites/defaults.swift.expected %t.result/callsites_defaults.swift

‎test/refactoring/SyntacticRename/custom-attrs.swift

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ struct Bar {
5757
}
5858

5959

60+
// REQUIRES: swift_swift_parser
6061
// RUN: %empty-directory(%t.result)
6162
// RUN: %empty-directory(%t.ranges)
6263
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="wrapper" -is-non-protocol-type -old-name "Foo" >> %t.ranges/custom-attrs-Foo.swift

‎test/refactoring/SyntacticRename/fixed_crashes.swift

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ enum AnEnum {
22
case /*last-enum-element:def*/lastOccurrence(a: Int)
33
}
44

5+
// REQUIRES: swift_swift_parser
56
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="last-enum-element" -is-function-like -old-name "lastOccurrence(a:)" -new-name "lastOccurrence(b:)"
67
// REQUIRES asserts

‎test/refactoring/SyntacticRename/functions.swift

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ _ = Memberwise(/*memberwise-x:ref*/x: 1, z: 3)
8383
let memberwise = Memberwise.init(/*memberwise-x:ref*/x:z:)
8484
_ = memberwise . /*memberwise-x:ref*/x
8585

86+
// REQUIRES: swift_swift_parser
8687
// RUN: %empty-directory(%t.ranges)
8788
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="import" -is-function-like -old-name "someFunc(a:)" >> %t.ranges/functions_import.swift
8889
// RUN: diff -u %S/Outputs/functions/import.swift.expected %t.ranges/functions_import.swift

‎test/refactoring/SyntacticRename/init.swift

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ _ = Test . /*test:ref*/init
99
_ = Test . /*test:ref*/init(base:)
1010

1111

12+
// REQUIRES: swift_swift_parser
1213
// RUN: %empty-directory(%t.ranges)
1314
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "init(base:)" >> %t.ranges/init.swift.expected
1415
// RUN: diff -u %S/Outputs/init.swift.expected %t.ranges/init.swift.expected

‎test/refactoring/SyntacticRename/invalid-newname.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: not %refactor -find-rename-ranges -source-filename %s -pos="ignore" -old-name "a" -new-name " "
23
// RUN: not %refactor -find-rename-ranges -source-filename %s -pos="ignore" -is-function-like -old-name "foo(a:)" -new-name "foo( :)"
34
// RUN: not %refactor -find-rename-ranges -source-filename %s -pos="ignore" -is-function-like -old-name "foo" -new-name "foo( )"
45

5-
func /*ignore*/foo() {}
6+
func /*ignore*/foo() {}

‎test/refactoring/SyntacticRename/macro-definition.swift

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: swift_swift_parser
12
// RUN: %empty-directory(%t.ranges)
23
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "StringifyMacro" | %FileCheck %s
34

‎test/refactoring/SyntacticRename/multiple-trailing-closures-defaulted.swift

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ func /*test:def*/test(x: () -> () = {}, _ xx: () -> () = {}, y: () -> () = {}, z
77
/*test:call*/test(y: {}) {}
88

99

10+
// REQUIRES: swift_swift_parser
1011
// RUN: %empty-directory(%t.ranges)
1112
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "test(x:_:y:z:)" >> %t.ranges/multiple-trailing-closures-defaulted.swift.expected
1213
// RUN: diff -u %S/Outputs/multiple-trailing-closures-defaulted.swift.expected %t.ranges/multiple-trailing-closures-defaulted.swift.expected

‎test/refactoring/SyntacticRename/multiple-trailing-closures.swift

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ func /*test:def*/test(x: () -> (), _ xx: () -> (), y: () -> (), z: ()->()) {}
66
/*test:call*/test {} _: {} y: {} z: {}
77

88

9+
// REQUIRES: swift_swift_parser
910
// RUN: %empty-directory(%t.ranges)
1011
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="test" -is-function-like -old-name "test(x:_:y:z:)" >> %t.ranges/multiple-trailing-closures.swift.expected
1112
// RUN: diff -u %S/Outputs/multiple-trailing-closures.swift.expected %t.ranges/multiple-trailing-closures.swift.expected

‎test/refactoring/SyntacticRename/objc-keypath.swift

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ _ = #keyPath(/*Outer*/Outer . /*Inner*/Inner . /*array*/array[0] . hashValue)
2424
// FIXME: Invalid and not resolved
2525
_ = #keyPath(/*Outer:unknown*/Outer . /*Inner:unknown*/Inner . /*dict:unknown*/dict . someKey . undefined)
2626

27+
// REQUIRES: swift_swift_parser
2728
// RUN: %empty-directory(%t)
2829
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="Outer" -old-name "Outer" >> %t/outer.swift
2930
// RUN: diff -u %S/Outputs/objc-keypath/outer.swift.expected %t/outer.swift

‎test/refactoring/SyntacticRename/property-wrapper-init.swift

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func uses() {
3535
}
3636

3737

38+
// REQUIRES: swift_swift_parser
3839
// RUN: %empty-directory(%t.result)
3940
// RUN: %empty-directory(%t.ranges)
4041
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="init" -is-function-like -old-name "init(initialValue:)" >> %t.ranges/property-wrapper-init.swift

‎test/refactoring/SyntacticRename/property-wrapper-split.swift

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ struct User {
1919
}
2020

2121

22+
// REQUIRES: swift_swift_parser
2223
// RUN: %empty-directory(%t.ranges)
2324
// RUN: %refactor -find-rename-ranges -source-filename %s -pos="someValue" -old-name "someValue" >> %t.ranges/property-wrapper-split-someValue.swift
2425
// RUN: diff -u %S/Outputs/property-wrapper-split/someValue.swift.expected %t.ranges/property-wrapper-split-someValue.swift

0 commit comments

Comments
 (0)