Skip to content

Commit 3022812

Browse files
ahoppenahoppen
authored
Merge pull request #63710 from ahoppen/ahoppen/dag
[IDE] Change -NEXT to -DAG in test cases
2 parents 7af52aa + 3ad1ac7 commit 3022812

13 files changed

+733
-731
lines changed

‎test/IDE/complete_after_self.swift‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -169,35 +169,35 @@ class ThisDerived1 : ThisBase1 {
169169
class func staticTest1() {
170170
self#^FUNC_STATIC_SELF_NO_DOT_1^#
171171
// FUNC_STATIC_SELF_NO_DOT_1: Begin completions
172-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: .derivedFunc0({#(self): ThisDerived1#})[#() -> Void#]
173-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticVar]/CurrNominal: .derivedStaticVar[#Int#]
174-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: .derivedStaticFunc0()[#Void#]
175-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Constructor]/CurrNominal: .init()[#ThisDerived1#]
176-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Constructor]/CurrNominal: .init({#a: Int#})[#ThisDerived1#]
177-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Constructor]/CurrNominal: .init({#conv: Int#})[#ThisDerived1#]
178-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: .test1({#(self): ThisDerived1#})[#() -> Void#]
179-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: .test2({#(self): ThisDerived1#})[#() -> Void#]
180-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: .staticTest1()[#Void#]
181-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: .staticTest2()[#Void#]
182-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: .derivedExtInstanceFunc0({#(self): ThisDerived1#})[#() -> Void#]
183-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: .derivedExtStaticFunc0()[#Void#]
184-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Struct]/CurrNominal: .DerivedExtNestedStruct[#DerivedExtNestedStruct#]
185-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Class]/CurrNominal: .DerivedExtNestedClass[#DerivedExtNestedClass#]
186-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Enum]/CurrNominal: .DerivedExtNestedEnum[#DerivedExtNestedEnum#]
187-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[TypeAlias]/CurrNominal: .DerivedExtNestedTypealias[#Int#]
188-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Constructor]/CurrNominal: .init({#someExtensionArg: Int#})[#ThisDerived1#]
189-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/Super: .baseFunc0({#(self): ThisBase1#})[#() -> Void#]
190-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/Super: .baseFunc1({#(self): ThisBase1#})[#(Int) -> Void#]
191-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticVar]/Super: .baseStaticVar[#Int#]
192-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticMethod]/Super: .baseStaticFunc0()[#Void#]
193-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[InstanceMethod]/Super: .baseExtInstanceFunc0({#(self): ThisBase1#})[#() -> Void#]
194-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[StaticMethod]/Super: .baseExtStaticFunc0()[#Void#]
195-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Struct]/Super: .BaseExtNestedStruct[#ThisBase1.BaseExtNestedStruct#]
196-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Class]/Super: .BaseExtNestedClass[#ThisBase1.BaseExtNestedClass#]
197-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[Enum]/Super: .BaseExtNestedEnum[#ThisBase1.BaseExtNestedEnum#]
198-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Decl[TypeAlias]/Super: .BaseExtNestedTypealias[#Int#]
199-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: Keyword[self]/CurrNominal: .self[#ThisDerived1.Type#]; name=self
200-
// FUNC_STATIC_SELF_NO_DOT_1-NEXT: End completions
172+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: .derivedFunc0({#(self): ThisDerived1#})[#() -> Void#]
173+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticVar]/CurrNominal: .derivedStaticVar[#Int#]
174+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: .derivedStaticFunc0()[#Void#]
175+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Constructor]/CurrNominal: .init()[#ThisDerived1#]
176+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Constructor]/CurrNominal: .init({#a: Int#})[#ThisDerived1#]
177+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Constructor]/CurrNominal: .init({#conv: Int#})[#ThisDerived1#]
178+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: .test1({#(self): ThisDerived1#})[#() -> Void#]
179+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: .test2({#(self): ThisDerived1#})[#() -> Void#]
180+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: .staticTest1()[#Void#]
181+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: .staticTest2()[#Void#]
182+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: .derivedExtInstanceFunc0({#(self): ThisDerived1#})[#() -> Void#]
183+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: .derivedExtStaticFunc0()[#Void#]
184+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Struct]/CurrNominal: .DerivedExtNestedStruct[#DerivedExtNestedStruct#]
185+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Class]/CurrNominal: .DerivedExtNestedClass[#DerivedExtNestedClass#]
186+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Enum]/CurrNominal: .DerivedExtNestedEnum[#DerivedExtNestedEnum#]
187+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[TypeAlias]/CurrNominal: .DerivedExtNestedTypealias[#Int#]
188+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Constructor]/CurrNominal: .init({#someExtensionArg: Int#})[#ThisDerived1#]
189+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/Super: .baseFunc0({#(self): ThisBase1#})[#() -> Void#]
190+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/Super: .baseFunc1({#(self): ThisBase1#})[#(Int) -> Void#]
191+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticVar]/Super: .baseStaticVar[#Int#]
192+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/Super: .baseStaticFunc0()[#Void#]
193+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/Super: .baseExtInstanceFunc0({#(self): ThisBase1#})[#() -> Void#]
194+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/Super: .baseExtStaticFunc0()[#Void#]
195+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Struct]/Super: .BaseExtNestedStruct[#ThisBase1.BaseExtNestedStruct#]
196+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Class]/Super: .BaseExtNestedClass[#ThisBase1.BaseExtNestedClass#]
197+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Enum]/Super: .BaseExtNestedEnum[#ThisBase1.BaseExtNestedEnum#]
198+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[TypeAlias]/Super: .BaseExtNestedTypealias[#Int#]
199+
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Keyword[self]/CurrNominal: .self[#ThisDerived1.Type#]; name=self
200+
// FUNC_STATIC_SELF_NO_DOT_1: End completions
201201
}
202202

203203
class func staticTest2() {

‎test/IDE/complete_at_top_level.swift‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ func resyncParser1() {}
4040

4141
fooObject#^TYPE_CHECKED_EXPR_1^#
4242
// TYPE_CHECKED_EXPR_1: Begin completions
43-
// TYPE_CHECKED_EXPR_1-NEXT: Decl[InstanceVar]/CurrNominal: .instanceVar[#Int#]{{; name=.+$}}
44-
// TYPE_CHECKED_EXPR_1-NEXT: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
45-
// TYPE_CHECKED_EXPR_1-NEXT: BuiltinOperator/None: = {#FooStruct#}[#Void#]{{; name=.+$}}
46-
// TYPE_CHECKED_EXPR_1-NEXT: Keyword[self]/CurrNominal: .self[#FooStruct#]{{; name=.+$}}
47-
// TYPE_CHECKED_EXPR_1-NEXT: End completions
43+
// TYPE_CHECKED_EXPR_1-DAG: Decl[InstanceVar]/CurrNominal: .instanceVar[#Int#]{{; name=.+$}}
44+
// TYPE_CHECKED_EXPR_1-DAG: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
45+
// TYPE_CHECKED_EXPR_1-DAG: BuiltinOperator/None: = {#FooStruct#}[#Void#]{{; name=.+$}}
46+
// TYPE_CHECKED_EXPR_1-DAG: Keyword[self]/CurrNominal: .self[#FooStruct#]{{; name=.+$}}
47+
// TYPE_CHECKED_EXPR_1: End completions
4848

4949
func resyncParser2() {}
5050

@@ -53,39 +53,39 @@ var _tmpVar1 : FooStruct
5353

5454
fooObject#^TYPE_CHECKED_EXPR_2^#
5555
// TYPE_CHECKED_EXPR_2: Begin completions
56-
// TYPE_CHECKED_EXPR_2-NEXT: Decl[InstanceVar]/CurrNominal: .instanceVar[#Int#]{{; name=.+$}}
57-
// TYPE_CHECKED_EXPR_2-NEXT: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
58-
// TYPE_CHECKED_EXPR_2-NEXT: BuiltinOperator/None: = {#FooStruct#}[#Void#]{{; name=.+$}}
59-
// TYPE_CHECKED_EXPR_2-NEXT: Keyword[self]/CurrNominal: .self[#FooStruct#]{{; name=.+$}}
60-
// TYPE_CHECKED_EXPR_2-NEXT: End completions
56+
// TYPE_CHECKED_EXPR_2-DAG: Decl[InstanceVar]/CurrNominal: .instanceVar[#Int#]{{; name=.+$}}
57+
// TYPE_CHECKED_EXPR_2-DAG: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
58+
// TYPE_CHECKED_EXPR_2-DAG: BuiltinOperator/None: = {#FooStruct#}[#Void#]{{; name=.+$}}
59+
// TYPE_CHECKED_EXPR_2-DAG: Keyword[self]/CurrNominal: .self[#FooStruct#]{{; name=.+$}}
60+
// TYPE_CHECKED_EXPR_2: End completions
6161

6262
func resyncParser3() {}
6363

6464
fooObject#^TYPE_CHECKED_EXPR_3^#.bar
6565
// TYPE_CHECKED_EXPR_3: Begin completions
66-
// TYPE_CHECKED_EXPR_3-NEXT: Decl[InstanceVar]/CurrNominal: .instanceVar[#Int#]{{; name=.+$}}
67-
// TYPE_CHECKED_EXPR_3-NEXT: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
68-
// TYPE_CHECKED_EXPR_3-NEXT: BuiltinOperator/None: = {#FooStruct#}[#Void#]{{; name=.+$}}
69-
// TYPE_CHECKED_EXPR_3-NEXT: Keyword[self]/CurrNominal: .self[#FooStruct#]{{; name=.+$}}
70-
// TYPE_CHECKED_EXPR_3-NEXT: End completions
66+
// TYPE_CHECKED_EXPR_3-DAG: Decl[InstanceVar]/CurrNominal: .instanceVar[#Int#]{{; name=.+$}}
67+
// TYPE_CHECKED_EXPR_3-DAG: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
68+
// TYPE_CHECKED_EXPR_3-DAG: BuiltinOperator/None: = {#FooStruct#}[#Void#]{{; name=.+$}}
69+
// TYPE_CHECKED_EXPR_3-DAG: Keyword[self]/CurrNominal: .self[#FooStruct#]{{; name=.+$}}
70+
// TYPE_CHECKED_EXPR_3: End completions
7171

7272
func resyncParser4() {}
7373

7474
fooObject.#^TYPE_CHECKED_EXPR_4^#
7575
// TYPE_CHECKED_EXPR_4: Begin completions
76-
// TYPE_CHECKED_EXPR_4-NEXT: Keyword[self]/CurrNominal: self[#FooStruct#]; name=self
77-
// TYPE_CHECKED_EXPR_4-NEXT: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
78-
// TYPE_CHECKED_EXPR_4-NEXT: Decl[InstanceMethod]/CurrNominal: instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
79-
// TYPE_CHECKED_EXPR_4-NEXT: End completions
76+
// TYPE_CHECKED_EXPR_4-DAG: Keyword[self]/CurrNominal: self[#FooStruct#]; name=self
77+
// TYPE_CHECKED_EXPR_4-DAG: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
78+
// TYPE_CHECKED_EXPR_4-DAG: Decl[InstanceMethod]/CurrNominal: instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
79+
// TYPE_CHECKED_EXPR_4: End completions
8080

8181
func resyncParser5() {}
8282

8383
fooObject.#^TYPE_CHECKED_EXPR_5^#.bar
8484
// TYPE_CHECKED_EXPR_5: Begin completions
85-
// TYPE_CHECKED_EXPR_5-NEXT: Keyword[self]/CurrNominal: self[#FooStruct#]; name=self
86-
// TYPE_CHECKED_EXPR_5-NEXT: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
87-
// TYPE_CHECKED_EXPR_5-NEXT: Decl[InstanceMethod]/CurrNominal: instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
88-
// TYPE_CHECKED_EXPR_5-NEXT: End completions
85+
// TYPE_CHECKED_EXPR_5-DAG: Keyword[self]/CurrNominal: self[#FooStruct#]; name=self
86+
// TYPE_CHECKED_EXPR_5-DAG: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
87+
// TYPE_CHECKED_EXPR_5-DAG: Decl[InstanceMethod]/CurrNominal: instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
88+
// TYPE_CHECKED_EXPR_5: End completions
8989

9090
func resyncParser6() {}
9191

@@ -103,10 +103,10 @@ var fooObjectWithErrorInInit : FooStruct = unknown_var
103103

104104
fooObjectWithErrorInInit.#^TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1^#
105105
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1: Begin completions
106-
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-NEXT: Keyword[self]/CurrNominal: self[#FooStruct#]; name=self
107-
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-NEXT: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
108-
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-NEXT: Decl[InstanceMethod]/CurrNominal: instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
109-
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-NEXT: End completions
106+
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-DAG: Keyword[self]/CurrNominal: self[#FooStruct#]; name=self
107+
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-DAG: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
108+
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1-DAG: Decl[InstanceMethod]/CurrNominal: instanceFunc({#(a): Int#})[#Void#]{{; name=.+$}}
109+
// TYPE_CHECKED_EXPR_WITH_ERROR_IN_INIT_1: End completions
110110

111111
func resyncParser6a() {}
112112

@@ -124,13 +124,13 @@ func resyncParser7() {}
124124

125125
var topLevelVar2 = FooStruct#^TOP_LEVEL_VAR_INIT_2^#
126126
// TOP_LEVEL_VAR_INIT_2: Begin completions
127-
// TOP_LEVEL_VAR_INIT_2-NEXT: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(self): FooStruct#})[#(Int) -> Void#]{{; name=.+$}}
128-
// TOP_LEVEL_VAR_INIT_2-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooStruct#]{{; name=.+$}}
129-
// TOP_LEVEL_VAR_INIT_2-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#instanceVar: Int#})[#FooStruct#]{{; name=.+$}}
130-
// TOP_LEVEL_VAR_INIT_2-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooStruct#]{{; name=.+$}}
131-
// TOP_LEVEL_VAR_INIT_2-NEXT: Keyword[self]/CurrNominal: .self[#FooStruct.Type#]; name=self
132-
// TOP_LEVEL_VAR_INIT_2-NEXT: Keyword/CurrNominal: .Type[#FooStruct.Type#]; name=Type
133-
// TOP_LEVEL_VAR_INIT_2-NEXT: End completions
127+
// TOP_LEVEL_VAR_INIT_2-DAG: Decl[InstanceMethod]/CurrNominal: .instanceFunc({#(self): FooStruct#})[#(Int) -> Void#]{{; name=.+$}}
128+
// TOP_LEVEL_VAR_INIT_2-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooStruct#]{{; name=.+$}}
129+
// TOP_LEVEL_VAR_INIT_2-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#instanceVar: Int#})[#FooStruct#]{{; name=.+$}}
130+
// TOP_LEVEL_VAR_INIT_2-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooStruct#]{{; name=.+$}}
131+
// TOP_LEVEL_VAR_INIT_2-DAG: Keyword[self]/CurrNominal: .self[#FooStruct.Type#]; name=self
132+
// TOP_LEVEL_VAR_INIT_2-DAG: Keyword/CurrNominal: .Type[#FooStruct.Type#]; name=Type
133+
// TOP_LEVEL_VAR_INIT_2: End completions
134134

135135
func resyncParser8() {}
136136

‎test/IDE/complete_crashes.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ func badMembers1(_ a: BadMembers1) {
1515
a#^BAD_MEMBERS_1^#
1616
}
1717
// BAD_MEMBERS_1: Begin completions
18-
// BAD_MEMBERS_1-NEXT: Decl[InstanceVar]/CurrNominal: .prop[#Int#]{{; name=.+$}}
19-
// BAD_MEMBERS_1-NEXT: Decl[Subscript]/CurrNominal: [{#(i): Int#}][#Double#]{{; name=.+$}}
18+
// BAD_MEMBERS_1-DAG: Decl[InstanceVar]/CurrNominal: .prop[#Int#]{{; name=.+$}}
19+
// BAD_MEMBERS_1-DAG: Decl[Subscript]/CurrNominal: [{#(i): Int#}][#Double#]{{; name=.+$}}
2020
// BAD_MEMBERS_1: End completions
2121

2222
protocol BadMembers2 {
@@ -31,10 +31,10 @@ func badMembers2(_ a: BadMembers2) {
3131
a#^BAD_MEMBERS_2^#
3232
}
3333
// BAD_MEMBERS_2: Begin completions, 3 items
34-
// BAD_MEMBERS_2-NEXT: Decl[InstanceVar]/CurrNominal: .prop[#Int#]{{; name=.+$}}
35-
// BAD_MEMBERS_2-NEXT: Decl[Subscript]/CurrNominal: [{#(i): Int#}][#Double#]{{; name=.+$}}
36-
// BAD_MEMBERS_2-NEXT: Keyword[self]/CurrNominal: .self[#BadMembers2#]; name=self
37-
// BAD_MEMBERS_2-NEXT: End completions
34+
// BAD_MEMBERS_2-DAG: Decl[InstanceVar]/CurrNominal: .prop[#Int#]{{; name=.+$}}
35+
// BAD_MEMBERS_2-DAG: Decl[Subscript]/CurrNominal: [{#(i): Int#}][#Double#]{{; name=.+$}}
36+
// BAD_MEMBERS_2-DAG: Keyword[self]/CurrNominal: .self[#BadMembers2#]; name=self
37+
// BAD_MEMBERS_2: End completions
3838

3939
func globalFunc() {}
4040

‎test/IDE/complete_default_arguments.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func testDefaultArgs2() {
8383
// DEFAULT_ARGS_2: End completions
8484

8585
// ONLY_DEFAULTS: Begin completions
86-
// ONLY_DEFAULTS-NEXT: Decl[FreeFunction]/CurrModule/Flair[ArgLabels]: ({#(a): Int#}, {#b: Int#})[#Void#]{{; name=.+$}}
86+
// ONLY_DEFAULTS-DAG: Decl[FreeFunction]/CurrModule/Flair[ArgLabels]: ({#(a): Int#}, {#b: Int#})[#Void#]{{; name=.+$}}
8787
// ONLY_DEFAULTS: End completions
8888

8989
func testDefaultArgs3() {

‎test/IDE/complete_dynamic_lookup.swift‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -231,21 +231,21 @@ protocol Bar { func bar() }
231231
// DL_CLASS_DOT: End completions
232232

233233
// TLOC_MEMBERS_NO_DOT: Begin completions
234-
// TLOC_MEMBERS_NO_DOT-NEXT: Decl[InstanceMethod]/CurrNominal: .returnsObjcClass({#(i): Int#})[#TopLevelObjcClass#]{{; name=.+$}}
235-
// TLOC_MEMBERS_NO_DOT-NEXT: Decl[InstanceMethod]/CurrNominal: .topLevelObjcClass_InstanceFunc1()[#Void#]{{; name=.+$}}
236-
// TLOC_MEMBERS_NO_DOT-NEXT: Decl[Subscript]/CurrNominal: [{#(i): Int8#}][#Int#]{{; name=.+$}}
237-
// TLOC_MEMBERS_NO_DOT-NEXT: Decl[InstanceVar]/CurrNominal: .topLevelObjcClass_Property1[#Int#]{{; name=.+$}}
234+
// TLOC_MEMBERS_NO_DOT-DAG: Decl[InstanceMethod]/CurrNominal: .returnsObjcClass({#(i): Int#})[#TopLevelObjcClass#]{{; name=.+$}}
235+
// TLOC_MEMBERS_NO_DOT-DAG: Decl[InstanceMethod]/CurrNominal: .topLevelObjcClass_InstanceFunc1()[#Void#]{{; name=.+$}}
236+
// TLOC_MEMBERS_NO_DOT-DAG: Decl[Subscript]/CurrNominal: [{#(i): Int8#}][#Int#]{{; name=.+$}}
237+
// TLOC_MEMBERS_NO_DOT-DAG: Decl[InstanceVar]/CurrNominal: .topLevelObjcClass_Property1[#Int#]{{; name=.+$}}
238238
// TLOC_MEMBERS_NO_DOT-DAG: Decl[InfixOperatorFunction]/OtherModule[Swift]/IsSystem: === {#AnyObject?#}[#Bool#];
239239
// TLOC_MEMBERS_NO_DOT-DAG: Decl[InfixOperatorFunction]/OtherModule[Swift]/IsSystem: !== {#AnyObject?#}[#Bool#];
240-
// TLOC_MEMBERS_NO_DOT-NEXT: Keyword[self]/CurrNominal: .self[#TopLevelObjcClass#]; name=self
241-
// TLOC_MEMBERS_NO_DOT-NEXT: End completions
240+
// TLOC_MEMBERS_NO_DOT-DAG: Keyword[self]/CurrNominal: .self[#TopLevelObjcClass#]; name=self
241+
// TLOC_MEMBERS_NO_DOT: End completions
242242

243243
// TLOC_MEMBERS_DOT: Begin completions
244-
// TLOC_MEMBERS_DOT-NEXT: Keyword[self]/CurrNominal: self[#TopLevelObjcClass#]; name=self
245-
// TLOC_MEMBERS_DOT-NEXT: Decl[InstanceMethod]/CurrNominal: returnsObjcClass({#(i): Int#})[#TopLevelObjcClass#]{{; name=.+$}}
246-
// TLOC_MEMBERS_DOT-NEXT: Decl[InstanceMethod]/CurrNominal: topLevelObjcClass_InstanceFunc1()[#Void#]{{; name=.+$}}
247-
// TLOC_MEMBERS_DOT-NEXT: Decl[InstanceVar]/CurrNominal: topLevelObjcClass_Property1[#Int#]{{; name=.+$}}
248-
// TLOC_MEMBERS_DOT-NEXT: End completions
244+
// TLOC_MEMBERS_DOT-DAG: Keyword[self]/CurrNominal: self[#TopLevelObjcClass#]; name=self
245+
// TLOC_MEMBERS_DOT-DAG: Decl[InstanceMethod]/CurrNominal: returnsObjcClass({#(i): Int#})[#TopLevelObjcClass#]{{; name=.+$}}
246+
// TLOC_MEMBERS_DOT-DAG: Decl[InstanceMethod]/CurrNominal: topLevelObjcClass_InstanceFunc1()[#Void#]{{; name=.+$}}
247+
// TLOC_MEMBERS_DOT-DAG: Decl[InstanceVar]/CurrNominal: topLevelObjcClass_Property1[#Int#]{{; name=.+$}}
248+
// TLOC_MEMBERS_DOT: End completions
249249

250250
// FIXME: Properties in Clang modules.
251251
// There's a test already: baz_Protocol_Property1.
@@ -478,9 +478,9 @@ func testAnyObject13(_ dl: AnyObject) {
478478
dl.returnsObjcClass!#^DL_FUNC_NAME_BANG_1^#
479479
}
480480
// DL_FUNC_NAME_BANG_1: Begin completions
481-
// DL_FUNC_NAME_BANG_1-NEXT: Decl[InstanceMethod]/CurrNominal/Flair[ArgLabels]: ({#(i): Int#})[#TopLevelObjcClass#]
482-
// DL_FUNC_NAME_BANG_1-NEXT: Keyword[self]/CurrNominal: .self[#(Int) -> TopLevelObjcClass#]; name=self
483-
// DL_FUNC_NAME_BANG_1-NEXT: End completions
481+
// DL_FUNC_NAME_BANG_1-DAG: Decl[InstanceMethod]/CurrNominal/Flair[ArgLabels]: ({#(i): Int#})[#TopLevelObjcClass#]
482+
// DL_FUNC_NAME_BANG_1-DAG: Keyword[self]/CurrNominal: .self[#(Int) -> TopLevelObjcClass#]; name=self
483+
// DL_FUNC_NAME_BANG_1: End completions
484484

485485
func testAnyObject14() {
486486
// FIXME: this syntax is not implemented yet.

0 commit comments

Comments
 (0)