Skip to content

Commit edfd3fd

Browse files
ahoppenahoppen
authored
Merge pull request #64506 from ahoppen/ahoppen/no-begin-end-completions
[IDE] Remove "Begin completions" and "End completions" from test cases
2 parents c8e11ab + 32eff21 commit edfd3fd

File tree

190 files changed

+191
-2196
lines changed

Some content is hidden

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

190 files changed

+191
-2196
lines changed

‎test/IDE/complete_actorisolation.swift‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,107 +16,85 @@ actor MyActor {
1616
extension MyActor {
1717
func testSyncFunc(other: MyActor) {
1818
let _ = #^IN_SYNCFUNC^#
19-
// IN_SYNCFUNC: Begin completions
2019
// IN_SYNCFUNC-DAG: Decl[InstanceVar]/CurrNominal: property[#Int#];
2120
// IN_SYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: syncFunc()[#Int#];
2221
// IN_SYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: syncNonSendable({#arg: MyNonSendable#})[#Int#];
2322
// IN_SYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: syncSendable({#arg: MySendable#})[#Int#];
2423
// IN_SYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: asyncFunc()[' async'][#Int#];
25-
// IN_SYNCFUNC: End completions
2624

2725
let _ = self.#^IN_SYNCFUNC_SELF_DOT^#
28-
// IN_SYNCFUNC_SELF_DOT: Begin completions
2926
// IN_SYNCFUNC_SELF_DOT-DAG: Decl[InstanceVar]/CurrNominal: property[#Int#];
3027
// IN_SYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncFunc()[#Int#];
3128
// IN_SYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncNonSendable({#arg: MyNonSendable#})[#Int#];
3229
// IN_SYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncSendable({#arg: MySendable#})[#Int#];
3330
// IN_SYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: asyncFunc()[' async'][#Int#];
34-
// IN_SYNCFUNC_SELF_DOT-DAG: End completions
3531

3632
let _ = self#^IN_SYNCFUNC_SELF_NODOT^#
37-
// IN_SYNCFUNC_SELF_NODOT: Begin completions
3833
// IN_SYNCFUNC_SELF_NODOT-DAG: Decl[InstanceVar]/CurrNominal: .property[#Int#];
3934
// IN_SYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncFunc()[#Int#];
4035
// IN_SYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncNonSendable({#arg: MyNonSendable#})[#Int#];
4136
// IN_SYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncSendable({#arg: MySendable#})[#Int#];
4237
// IN_SYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: .asyncFunc()[' async'][#Int#];
4338
// IN_SYNCFUNC_SELF_NODOT-DAG: Decl[Subscript]/CurrNominal: [{#(idx): Int#}][#Int#];
44-
// IN_SYNCFUNC_SELF_NODOT-DAG: End completions
4539

4640
let _ = other.#^IN_SYNCFUNC_OTHER_DOT^#
47-
// IN_SYNCFUNC_OTHER_DOT: Begin completions
4841
// IN_SYNCFUNC_OTHER_DOT-DAG: Decl[InstanceVar]/CurrNominal/NotRecommended: property[#Int#][' async'];
4942
// IN_SYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: syncFunc()[' async'][#Int#];
5043
// IN_SYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: syncNonSendable({#arg: MyNonSendable#})[' async'][#Int#];
5144
// IN_SYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: syncSendable({#arg: MySendable#})[' async'][#Int#];
5245
// IN_SYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: asyncFunc()[' async'][#Int#];
53-
// IN_SYNCFUNC_OTHER_DOT: End completions
5446

5547
let _ = other#^IN_SYNCFUNC_OTHER_NODOT^#
56-
// IN_SYNCFUNC_OTHER_NODOT: Begin completions
5748
// IN_SYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceVar]/CurrNominal/NotRecommended: .property[#Int#][' async'];
5849
// IN_SYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: .syncFunc()[' async'][#Int#];
5950
// IN_SYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: .syncNonSendable({#arg: MyNonSendable#})[' async'][#Int#];
6051
// IN_SYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: .syncSendable({#arg: MySendable#})[' async'][#Int#];
6152
// IN_SYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: .asyncFunc()[' async'][#Int#];
6253
// IN_SYNCFUNC_OTHER_NODOT-DAG: Decl[Subscript]/CurrNominal/NotRecommended: [{#(idx): Int#}][' async'][#Int#];
63-
// IN_SYNCFUNC_OTHER_NODOT: End completions
6454
}
6555
func testAsyncFunc(other: MyActor) async {
6656
let _ = #^IN_ASYNCFUNC^#
67-
// IN_ASYNCFUNC: Begin completions
6857
// IN_ASYNCFUNC-DAG: Decl[InstanceVar]/CurrNominal: property[#Int#];
6958
// IN_ASYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: syncFunc()[#Int#];
7059
// IN_ASYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: syncNonSendable({#arg: MyNonSendable#})[#Int#];
7160
// IN_ASYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: syncSendable({#arg: MySendable#})[#Int#];
7261
// IN_ASYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: asyncFunc()[' async'][#Int#];
7362
// IN_ASYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: testSyncFunc({#other: MyActor#})[#Void#];
7463
// IN_ASYNCFUNC-DAG: Decl[InstanceMethod]/CurrNominal: testAsyncFunc({#other: MyActor#})[' async'][#Void#];
75-
// IN_ASYNCFUNC: End completions
7664
let _ = self.#^IN_ASYNCFUNC_SELF_DOT^#
77-
// IN_ASYNCFUNC_SELF_DOT: Begin completions
7865
// IN_ASYNCFUNC_SELF_DOT-DAG: Decl[InstanceVar]/CurrNominal: property[#Int#];
7966
// IN_ASYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncFunc()[#Int#];
8067
// IN_ASYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncNonSendable({#arg: MyNonSendable#})[#Int#];
8168
// IN_ASYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncSendable({#arg: MySendable#})[#Int#];
8269
// IN_ASYNCFUNC_SELF_DOT-DAG: Decl[InstanceMethod]/CurrNominal: asyncFunc()[' async'][#Int#];
83-
// IN_ASYNCFUNC_SELF_DOT: End completions
8470

8571
let _ = self#^IN_ASYNCFUNC_SELF_NODOT^#
86-
// IN_ASYNCFUNC_SELF_NODOT: Begin completions
8772
// IN_ASYNCFUNC_SELF_NODOT-DAG: Decl[InstanceVar]/CurrNominal: .property[#Int#];
8873
// IN_ASYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncFunc()[#Int#];
8974
// IN_ASYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncNonSendable({#arg: MyNonSendable#})[#Int#];
9075
// IN_ASYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncSendable({#arg: MySendable#})[#Int#];
9176
// IN_ASYNCFUNC_SELF_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .asyncFunc()[' async'][#Int#];
9277
// IN_ASYNCFUNC_SELF_NODOT-DAG: Decl[Subscript]/CurrNominal: [{#(idx): Int#}][#Int#];
93-
// IN_ASYNCFUNC_SELF_NODOT-DAG: End completions
9478

9579
let _ = other.#^IN_ASYNCFUNC_OTHER_DOT^#
96-
// IN_ASYNCFUNC_OTHER_DOT: Begin completions
9780
// IN_ASYNCFUNC_OTHER_DOT-DAG: Decl[InstanceVar]/CurrNominal: property[#Int#][' async'];
9881
// IN_ASYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncFunc()[' async'][#Int#];
9982
// IN_ASYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: syncNonSendable({#arg: MyNonSendable#})[' async'][#Int#];
10083
// IN_ASYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal: syncSendable({#arg: MySendable#})[' async'][#Int#];
10184
// IN_ASYNCFUNC_OTHER_DOT-DAG: Decl[InstanceMethod]/CurrNominal: asyncFunc()[' async'][#Int#];
102-
// IN_ASYNCFUNC_OTHER_DOT: End completions
10385

10486
let _ = other#^IN_ASYNCFUNC_OTHER_NODOT^#
105-
// IN_ASYNCFUNC_OTHER_NODOT: Begin completions
10687
// IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceVar]/CurrNominal: .property[#Int#][' async'];
10788
// IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncFunc()[' async'][#Int#];
10889
// IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal/NotRecommended: .syncNonSendable({#arg: MyNonSendable#})[' async'][#Int#];
10990
// IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .syncSendable({#arg: MySendable#})[' async'][#Int#];
11091
// IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[InstanceMethod]/CurrNominal: .asyncFunc()[' async'][#Int#];
11192
// IN_ASYNCFUNC_OTHER_NODOT-DAG: Decl[Subscript]/CurrNominal: [{#(idx): Int#}][' async'][#Int#];
112-
// IN_ASYNCFUNC_OTHER_NODOT: End completions
11393
}
11494

11595
func testActorKind() {
11696
let _ = #^GLOBAL^#
117-
// GLOBAL: Begin completions
11897
// GLOBAL: Decl[Actor]/CurrModule: MyActor[#MyActor#]; name=MyActor
119-
// GLOBAL: End completions
12098
}
12199
}
122100

‎test/IDE/complete_after_self.swift‎

Lines changed: 29 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ class ThisDerived1 : ThisBase1 {
8181

8282
class func derivedStaticFunc0() {}
8383

84-
// COMMON_SELF_NO_DOT_1: Begin completions
8584
// COMMON_SELF_NO_DOT_1-DAG: Decl[InstanceVar]/CurrNominal: .derivedInstanceVar[#Int#]{{; name=.+$}}
8685
// COMMON_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: .derivedFunc0()[#Void#]{{; name=.+$}}
8786
// COMMON_SELF_NO_DOT_1-DAG: Decl[Subscript]/CurrNominal: [{#(i): Double#}][#Int#]{{; name=.+$}}
@@ -98,9 +97,7 @@ class ThisDerived1 : ThisBase1 {
9897
// COMMON_SELF_NO_DOT_1-DAG: Decl[InstanceVar]/Super: .baseExtProp[#Int#]{{; name=.+$}}
9998
// COMMON_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/Super: .baseExtInstanceFunc0()[#Void#]{{; name=.+$}}
10099
// COMMON_SELF_NO_DOT_1-DAG: Decl[InstanceVar]/Super: .baseExtStaticProp[#Int#]{{; name=.+$}}
101-
// COMMON_SELF_NO_DOT_1: End completions
102100

103-
// COMMON_SELF_DOT_1: Begin completions
104101
// COMMON_SELF_DOT_1-DAG: Decl[InstanceVar]/CurrNominal: derivedInstanceVar[#Int#]{{; name=.+$}}
105102
// COMMON_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: derivedFunc0()[#Void#]{{; name=.+$}}
106103
// COMMON_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: test1()[#Void#]{{; name=.+$}}
@@ -114,13 +111,11 @@ class ThisDerived1 : ThisBase1 {
114111
// COMMON_SELF_DOT_1-DAG: Decl[InstanceVar]/Super: baseExtProp[#Int#]{{; name=.+$}}
115112
// COMMON_SELF_DOT_1-DAG: Decl[InstanceMethod]/Super: baseExtInstanceFunc0()[#Void#]{{; name=.+$}}
116113
// COMMON_SELF_DOT_1-DAG: Decl[InstanceVar]/Super: baseExtStaticProp[#Int#]{{; name=.+$}}
117-
// COMMON_SELF_DOT_1: End completions
118114

119115
init() {
120116
self#^CONSTRUCTOR_SELF_NO_DOT_1?check=CONSTRUCTOR_SELF_NO_DOT_1;check=COMMON_SELF_NO_DOT_1^#
121117
// CONSTRUCTOR_SELF_NO_DOT_1: Begin completions, 21 items
122118
// CONSTRUCTOR_SELF_NO_DOT_1-NOT: Decl[Constructor]
123-
// CONSTRUCTOR_SELF_NO_DOT_1: End completions
124119
let d: ThisDerived1
125120
d#^CONSTRUCTOR_NONSELF_NO_DOT_1?check=COMMON_SELF_NO_DOT_1;check=NO_INIT^#
126121
// NO_INIT-NOT: init()
@@ -130,7 +125,6 @@ class ThisDerived1 : ThisBase1 {
130125
self.#^CONSTRUCTOR_SELF_DOT_1?check=CONSTRUCTOR_SELF_DOT_1;check=COMMON_SELF_DOT_1^#
131126
// CONSTRUCTOR_SELF_DOT_1: Begin completions, 16 items
132127
// CONSTRUCTOR_SELF_DOT_1-NOT: Decl[Constructor]
133-
// CONSTRUCTOR_SELF_DOT_1: End completions
134128
let d: ThisDerived1
135129
d.#^CONSTRUCTOR_NONSELF_DOT_1?check=COMMON_SELF_DOT_1;check=NO_INIT^#
136130
}
@@ -141,34 +135,28 @@ class ThisDerived1 : ThisBase1 {
141135
// CONVENIENCE_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init()[#ThisDerived1#]; name=init()
142136
// CONVENIENCE_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ThisDerived1#]; name=init(a:)
143137
// CONVENIENCE_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init({#conv: Int#})[#ThisDerived1#]; name=init(conv:)
144-
// CONVENIENCE_SELF_DOT_1: End completions
145138
}
146139

147140
deinit {
148141
self#^DESTRUCTOR_SELF_NO_DOT_1?check=DESTRUCTOR_SELF_NO_DOT_1;check=COMMON_SELF_NO_DOT_1;check=NO_INIT^#
149142
// DESTRUCTOR_SELF_NO_DOT_1: Begin completions, 21 items
150-
// DESTRUCTOR_SELF_NO_DOT_1: End completions
151143

152144
self.#^DESTRUCTOR_SELF_DOT_1?check=DESTRUCTOR_SELF_DOT_1;check=COMMON_SELF_DOT_1;check=NO_INIT^#
153145
// DESTRUCTOR_SELF_DOT_1: Begin completions, 16 items
154-
// DESTRUCTOR_SELF_DOT_1: End completions
155146
}
156147

157148
func test1() {
158149
self#^FUNC_SELF_NO_DOT_1?check=FUNC_SELF_NO_DOT_1;check=COMMON_SELF_NO_DOT_1;check=NO_INIT^#
159150
// FUNC_SELF_NO_DOT_1: Begin completions, 21 items
160-
// FUNC_SELF_NO_DOT_1: End completions
161151
}
162152

163153
func test2() {
164154
self.#^FUNC_SELF_DOT_1?check=FUNC_SELF_DOT_1;check=COMMON_SELF_DOT_1;check=NO_INIT^#
165155
// FUNC_SELF_DOT_1: Begin completions, 16 items
166-
// FUNC_SELF_DOT_1: End completions
167156
}
168157

169158
class func staticTest1() {
170159
self#^FUNC_STATIC_SELF_NO_DOT_1^#
171-
// FUNC_STATIC_SELF_NO_DOT_1: Begin completions
172160
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: .derivedFunc0({#(self): ThisDerived1#})[#() -> Void#]
173161
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticVar]/CurrNominal: .derivedStaticVar[#Int#]
174162
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: .derivedStaticFunc0()[#Void#]
@@ -197,41 +185,39 @@ class ThisDerived1 : ThisBase1 {
197185
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[Enum]/Super: .BaseExtNestedEnum[#ThisBase1.BaseExtNestedEnum#]
198186
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Decl[TypeAlias]/Super: .BaseExtNestedTypealias[#Int#]
199187
// FUNC_STATIC_SELF_NO_DOT_1-DAG: Keyword[self]/CurrNominal: .self[#ThisDerived1.Type#]; name=self
200-
// FUNC_STATIC_SELF_NO_DOT_1: End completions
201188
}
202189

203190
class func staticTest2() {
204191
self.#^FUNC_STATIC_SELF_DOT_1^#
205-
// FUNC_STATIC_SELF_DOT_1: Begin completions
206-
// FUNC_STATIC_SELF_DOT_1-NEXT: Keyword[self]/CurrNominal: self[#ThisDerived1.Type#]; name=self
207-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: derivedFunc0({#(self): ThisDerived1#})[#() -> Void#]
208-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticVar]/CurrNominal: derivedStaticVar[#Int#]
209-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: derivedStaticFunc0()[#Void#]
210-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Constructor]/CurrNominal: init()[#ThisDerived1#]
211-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ThisDerived1#]
212-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Constructor]/CurrNominal: init({#conv: Int#})[#ThisDerived1#]
213-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: test1({#(self): ThisDerived1#})[#() -> Void#]
214-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: test2({#(self): ThisDerived1#})[#() -> Void#]
215-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: staticTest1()[#Void#]
216-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: staticTest2()[#Void#]
217-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/CurrNominal: derivedExtInstanceFunc0({#(self): ThisDerived1#})[#() -> Void#]
218-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticMethod]/CurrNominal: derivedExtStaticFunc0()[#Void#]
219-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Struct]/CurrNominal: DerivedExtNestedStruct[#DerivedExtNestedStruct#]
220-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Class]/CurrNominal: DerivedExtNestedClass[#DerivedExtNestedClass#]
221-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Enum]/CurrNominal: DerivedExtNestedEnum[#DerivedExtNestedEnum#]
222-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[TypeAlias]/CurrNominal: DerivedExtNestedTypealias[#Int#]
223-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Constructor]/CurrNominal: init({#someExtensionArg: Int#})[#ThisDerived1#]
224-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/Super: baseFunc0({#(self): ThisBase1#})[#() -> Void#]
225-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/Super: baseFunc1({#(self): ThisBase1#})[#(Int) -> Void#]
226-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticVar]/Super: baseStaticVar[#Int#]
227-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticMethod]/Super: baseStaticFunc0()[#Void#]
228-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[InstanceMethod]/Super: baseExtInstanceFunc0({#(self): ThisBase1#})[#() -> Void#]
229-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[StaticMethod]/Super: baseExtStaticFunc0()[#Void#]
230-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Struct]/Super: BaseExtNestedStruct[#ThisBase1.BaseExtNestedStruct#]
231-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Class]/Super: BaseExtNestedClass[#ThisBase1.BaseExtNestedClass#]
232-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[Enum]/Super: BaseExtNestedEnum[#ThisBase1.BaseExtNestedEnum#]
233-
// FUNC_STATIC_SELF_DOT_1-NEXT: Decl[TypeAlias]/Super: BaseExtNestedTypealias[#Int#]
234-
// FUNC_STATIC_SELF_DOT_1-NEXT: End completions
192+
// FUNC_STATIC_SELF_DOT_1: Begin completions, 28 items
193+
// FUNC_STATIC_SELF_DOT_1-DAG: Keyword[self]/CurrNominal: self[#ThisDerived1.Type#]; name=self
194+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: derivedFunc0({#(self): ThisDerived1#})[#() -> Void#]
195+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticVar]/CurrNominal: derivedStaticVar[#Int#]
196+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: derivedStaticFunc0()[#Void#]
197+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init()[#ThisDerived1#]
198+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ThisDerived1#]
199+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init({#conv: Int#})[#ThisDerived1#]
200+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: test1({#(self): ThisDerived1#})[#() -> Void#]
201+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: test2({#(self): ThisDerived1#})[#() -> Void#]
202+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: staticTest1()[#Void#]
203+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: staticTest2()[#Void#]
204+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: derivedExtInstanceFunc0({#(self): ThisDerived1#})[#() -> Void#]
205+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticMethod]/CurrNominal: derivedExtStaticFunc0()[#Void#]
206+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Struct]/CurrNominal: DerivedExtNestedStruct[#DerivedExtNestedStruct#]
207+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Class]/CurrNominal: DerivedExtNestedClass[#DerivedExtNestedClass#]
208+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Enum]/CurrNominal: DerivedExtNestedEnum[#DerivedExtNestedEnum#]
209+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[TypeAlias]/CurrNominal: DerivedExtNestedTypealias[#Int#]
210+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init({#someExtensionArg: Int#})[#ThisDerived1#]
211+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/Super: baseFunc0({#(self): ThisBase1#})[#() -> Void#]
212+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/Super: baseFunc1({#(self): ThisBase1#})[#(Int) -> Void#]
213+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticVar]/Super: baseStaticVar[#Int#]
214+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticMethod]/Super: baseStaticFunc0()[#Void#]
215+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[InstanceMethod]/Super: baseExtInstanceFunc0({#(self): ThisBase1#})[#() -> Void#]
216+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[StaticMethod]/Super: baseExtStaticFunc0()[#Void#]
217+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Struct]/Super: BaseExtNestedStruct[#ThisBase1.BaseExtNestedStruct#]
218+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Class]/Super: BaseExtNestedClass[#ThisBase1.BaseExtNestedClass#]
219+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[Enum]/Super: BaseExtNestedEnum[#ThisBase1.BaseExtNestedEnum#]
220+
// FUNC_STATIC_SELF_DOT_1-DAG: Decl[TypeAlias]/Super: BaseExtNestedTypealias[#Int#]
235221
}
236222
}
237223

@@ -275,7 +261,6 @@ extension ThisDerived1 {
275261
// EXTENSION_CONSTRUCTOR_SELF_DOT_1: Decl[Constructor]/CurrNominal: init()[#ThisDerived1#]; name=init()
276262
// EXTENSION_CONSTRUCTOR_SELF_DOT_1: Decl[Constructor]/CurrNominal: init({#a: Int#})[#ThisDerived1#]; name=init(a:)
277263
// EXTENSION_CONSTRUCTOR_SELF_DOT_1: Decl[Constructor]/CurrNominal: init({#someExtensionArg: Int#})[#ThisDerived1#]; name=init(someExtensionArg:)
278-
// EXTENSION_CONSTRUCTOR_SELF_DOT_1: End completions
279264

280265
}
281266
}
@@ -289,7 +274,6 @@ struct S1 {
289274
// STRUCT_CONSTRUCTOR_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init()[#S1#]; name=init()
290275
// STRUCT_CONSTRUCTOR_SELF_DOT_1-DAG: Decl[Constructor]/CurrNominal: init({#x: Int#})[#S1#]; name=init(x:)
291276
// STRUCT_CONSTRUCTOR_SELF_DOT_1-DAG: Decl[InstanceMethod]/CurrNominal: f()[#Void#]; name=f()
292-
// STRUCT_CONSTRUCTOR_SELF_DOT_1: End completions
293277
let s: S1
294278
s.#^STRUCT_CONSTRUCTOR_NONSELF_DOT_1?check=NO_INIT^#
295279
}

‎test/IDE/complete_after_sself.swift‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class MyClass {
3535
// CHECK-MyClass-DAG: Decl[Constructor]/CurrNominal: init()[#MyClass#];
3636
// CHECK-MyClass-DAG: Decl[InstanceMethod]/CurrNominal: instanceMethod({#(self): MyClass#})[#() -> Void#];
3737
// CHECK-MyClass-DAG: Decl[StaticMethod]/CurrNominal: staticMethod()[#Void#];
38-
// CHECK-MyClass: End completions
3938
}
4039

4140
struct MyStruct {
@@ -57,7 +56,6 @@ struct MyStruct {
5756
// CHECK-MyStruct-DAG: Decl[Constructor]/CurrNominal: init()[#MyStruct#];
5857
// CHECK-MyStruct-DAG: Decl[InstanceMethod]/CurrNominal: instanceMethod({#(self): MyStruct#})[#() -> Void#];
5958
// CHECK-MyStruct-DAG: Decl[StaticMethod]/CurrNominal: staticMethod()[#Void#];
60-
// CHECK-MyStruct: End completions
6159
}
6260

6361
protocol MyProto { }
@@ -80,5 +78,4 @@ extension MyProto {
8078
// CHECK-MyProto-DAG: Decl[Constructor]/CurrNominal: init()[#MyProto#];
8179
// CHECK-MyProto-DAG: Decl[InstanceMethod]/CurrNominal: instanceMethod({#(self): MyProto#})[#() -> Void#];
8280
// CHECK-MyProto-DAG: Decl[StaticMethod]/CurrNominal: staticMethod()[#Void#];
83-
// CHECK-MyProto: End completions
8481
}

0 commit comments

Comments
 (0)