Skip to content

Commit 044473f

Browse files
rintarorintaro
committed
[IDE/Tests] Adjust test cases
Some things went off when this test was disabled
1 parent 59121dc commit 044473f

File tree

1 file changed

+74
-73
lines changed

1 file changed

+74
-73
lines changed

‎test/IDE/complete_from_clang_framework.swift‎

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ struct SwiftStruct {
4646
// Test that we don't include Clang completions in unexpected places.
4747
func testSwiftCompletions(foo: SwiftStruct) {
4848
foo.#^SWIFT_COMPLETIONS^#
49-
// SWIFT_COMPLETIONS-NEXT: Keyword[self]/CurrNominal: self[#SwiftStruct#]; name=self
50-
// SWIFT_COMPLETIONS-NEXT: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
49+
// SWIFT_COMPLETIONS-DAG: Keyword[self]/CurrNominal: self[#SwiftStruct#]; name=self
50+
// SWIFT_COMPLETIONS-DAG: Decl[InstanceVar]/CurrNominal: instanceVar[#Int#]{{; name=.+$}}
5151
}
5252

5353
// CLANG_FOO-DAG: Decl[Struct]/OtherModule[Foo]: FooEnum1[#FooEnum1#]{{; name=.+$}}
@@ -214,99 +214,100 @@ func testCompleteModuleQualifiedBar1() {
214214

215215
func testCompleteFunctionCall1() {
216216
fooFunc1#^FUNCTION_CALL_1^#
217-
// FUNCTION_CALL_1-NEXT: Decl[FreeFunction]/OtherModule[Foo]/Flair[ArgLabels]: ({#(a): Int32#})[#Int32#]{{; name=.+$}}
218-
// FUNCTION_CALL_1-NEXT: Keyword[self]/CurrNominal: .self[#(Int32) -> Int32#]; name=self
217+
// FUNCTION_CALL_1-DAG: Decl[FreeFunction]/OtherModule[Foo]/Flair[ArgLabels]: ({#(a): Int32#})[#Int32#]{{; name=.+$}}
218+
// FUNCTION_CALL_1-DAG: Keyword[self]/CurrNominal: .self[#(Int32) -> Int32#]; name=self
219219
}
220220

221221
func testCompleteFunctionCall2() {
222222
fooFunc1AnonymousParam#^FUNCTION_CALL_2^#
223-
// FUNCTION_CALL_2-NEXT: Decl[FreeFunction]/OtherModule[Foo]/Flair[ArgLabels]: ({#Int32#})[#Int32#]{{; name=.+$}}
224-
// FUNCTION_CALL_2-NEXT: Keyword[self]/CurrNominal: .self[#(Int32) -> Int32#]; name=self
223+
// FUNCTION_CALL_2-DAG: Decl[FreeFunction]/OtherModule[Foo]/Flair[ArgLabels]: ({#Int32#})[#Int32#]{{; name=.+$}}
224+
// FUNCTION_CALL_2-DAG: Keyword[self]/CurrNominal: .self[#(Int32) -> Int32#]; name=self
225225
}
226226

227227
func testCompleteStructMembers1() {
228228
FooStruct1#^CLANG_STRUCT_MEMBERS_1^#
229-
// CLANG_STRUCT_MEMBERS_1-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooStruct1#]{{; name=.+$}}
230-
// CLANG_STRUCT_MEMBERS_1-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#x: Int32#}, {#y: Double#})[#FooStruct1#]{{; name=.+$}}
231-
// CLANG_STRUCT_MEMBERS_1-NEXT: Keyword[self]/CurrNominal: .self[#FooStruct1.Type#]; name=self
232-
// CLANG_STRUCT_MEMBERS_1-NEXT: Keyword/CurrNominal: .Type[#FooStruct1.Type#]; name=Type
229+
// CLANG_STRUCT_MEMBERS_1-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooStruct1#]{{; name=.+$}}
230+
// CLANG_STRUCT_MEMBERS_1-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#x: Int32#}, {#y: Double#})[#FooStruct1#]{{; name=.+$}}
231+
// CLANG_STRUCT_MEMBERS_1-DAG: Keyword[self]/CurrNominal: .self[#FooStruct1.Type#]; name=self
232+
// CLANG_STRUCT_MEMBERS_1-DAG: Keyword/CurrNominal: .Type[#FooStruct1.Type#]; name=Type
233233
}
234234

235235
func testCompleteClassMembers1() {
236236
FooClassBase#^CLANG_CLASS_MEMBERS_1^#
237237
// FIXME: do we want to show curried instance functions for Objective-C classes?
238-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: .fooBaseInstanceFunc0()[#Void#]{{; name=.+$}}
239-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFunc0({#(self): FooClassBase#})[#() -> Void#]{{; name=.+$}}
240-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: .fooBaseInstanceFunc1({#(anObject): Any!#})[#FooClassBase!#]{{; name=.+$}}
241-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFunc1({#(self): FooClassBase#})[#(Any?) -> FooClassBase?#]{{; name=.+$}}
242-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooClassBase!#]
243-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#float: Float#})[#FooClassBase!#]{{; name=.+$}}
244-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: .fooBaseInstanceFuncOverridden()[#Void#]{{; name=.+$}}
245-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFuncOverridden({#(self): FooClassBase#})[#() -> Void#]{{; name=.+$}}
246-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: .fooBaseClassFunc0()[#Void#]{{; name=.+$}}
247-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#(x): Int32#})[#FooClassBase!#]
248-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: ._internalMeth3()[#Any!#]
249-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: ._internalMeth3({#(self): FooClassBase#})[#() -> Any?#]
250-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: ._internalMeth2()[#Any!#]
251-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: ._internalMeth2({#(self): FooClassBase#})[#() -> Any?#]
252-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: .nonInternalMeth()[#Any!#]
253-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .nonInternalMeth({#(self): FooClassBase#})[#() -> Any?#]
254-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[StaticMethod]/CurrNominal: ._internalMeth1()[#Any!#]
255-
// CLANG_CLASS_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: ._internalMeth1({#(self): FooClassBase#})[#() -> Any?#]
256-
// CLANG_CLASS_MEMBERS_1-NEXT: Keyword[self]/CurrNominal: .self[#FooClassBase.Type#]; name=self
257-
// CLANG_CLASS_MEMBERS_1-NEXT: Keyword/CurrNominal: .Type[#FooClassBase.Type#]; name=Type
238+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: .fooBaseInstanceFunc0()[#Void#]{{; name=.+$}}
239+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFunc0({#(self): FooClassBase#})[#() -> Void#]{{; name=.+$}}
240+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: .fooBaseInstanceFunc1({#(anObject): Any!#})[#FooClassBase!#]{{; name=.+$}}
241+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFunc1({#(self): FooClassBase#})[#(Any?) -> FooClassBase?#]{{; name=.+$}}
242+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooClassBase!#]
243+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#float: Float#})[#FooClassBase!#]{{; name=.+$}}
244+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: .fooBaseInstanceFuncOverridden()[#Void#]{{; name=.+$}}
245+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFuncOverridden({#(self): FooClassBase#})[#() -> Void#]{{; name=.+$}}
246+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: .fooBaseClassFunc0()[#Void#]{{; name=.+$}}
247+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#(x): Int32#})[#FooClassBase!#]
248+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: ._internalMeth3()[#Any!#]
249+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: ._internalMeth3({#(self): FooClassBase#})[#() -> Any?#]
250+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: ._internalMeth2()[#Any!#]
251+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: ._internalMeth2({#(self): FooClassBase#})[#() -> Any?#]
252+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: .nonInternalMeth()[#Any!#]
253+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .nonInternalMeth({#(self): FooClassBase#})[#() -> Any?#]
254+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[StaticMethod]/CurrNominal: ._internalMeth1()[#Any!#]
255+
// CLANG_CLASS_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: ._internalMeth1({#(self): FooClassBase#})[#() -> Any?#]
256+
// CLANG_CLASS_MEMBERS_1-DAG: Keyword[self]/CurrNominal: .self[#FooClassBase.Type#]; name=self
257+
// CLANG_CLASS_MEMBERS_1-DAG: Keyword/CurrNominal: .Type[#FooClassBase.Type#]; name=Type
258258
}
259259

260260
func testCompleteClassMembers2() {
261261
FooClassDerived#^CLANG_CLASS_MEMBERS_2^#
262262

263-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc0({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
264-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc1({#(self): FooClassDerived#})[#(Int32) -> Void#]{{; name=.+$}}
265-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc2({#(self): FooClassDerived#})[#(Int32, withB: Int32) -> Void#]{{; name=.+$}}
266-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFuncOverridden({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
267-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/CurrNominal: .fooClassFunc0()[#Void#]{{; name=.+$}}
268-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooClassDerived!#]
269-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#float: Float#})[#FooClassDerived!#]{{; name=.+$}}
270-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooProtoFunc({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
271-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation1({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
272-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation2({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
273-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/CurrNominal: .fooProtoClassFunc()[#Void#]{{; name=.+$}}
274-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: .fooBaseInstanceFunc0()[#Void#]{{; name=.+$}}
275-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc0({#(self): FooClassBase#})[#() -> Void#]{{; name=.+$}}
276-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: .fooBaseInstanceFunc1({#(anObject): Any!#})[#FooClassBase!#]{{; name=.+$}}
277-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc1({#(self): FooClassBase#})[#(Any?) -> FooClassBase?#]{{; name=.+$}}
278-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: .fooBaseInstanceFuncOverridden()[#Void#]{{; name=.+$}}
279-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: .fooBaseClassFunc0()[#Void#]{{; name=.+$}}
280-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: ._internalMeth3()[#Any!#]
281-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/Super: ._internalMeth3({#(self): FooClassBase#})[#() -> Any?#]
282-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: ._internalMeth2()[#Any!#]
283-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/Super: ._internalMeth2({#(self): FooClassBase#})[#() -> Any?#]
284-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: .nonInternalMeth()[#Any!#]
285-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/Super: .nonInternalMeth({#(self): FooClassBase#})[#() -> Any?#]
286-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[StaticMethod]/Super: ._internalMeth1()[#Any!#]
287-
// CLANG_CLASS_MEMBERS_2-NEXT: Decl[InstanceMethod]/Super: ._internalMeth1({#(self): FooClassBase#})[#() -> Any?#]
288-
// CLANG_CLASS_MEMBERS_2-NEXT: Keyword[self]/CurrNominal: .self[#FooClassDerived.Type#]; name=self
289-
// CLANG_CLASS_MEMBERS_2-NEXT: Keyword/CurrNominal: .Type[#FooClassDerived.Type#]; name=Type
263+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc0({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
264+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc1({#(self): FooClassDerived#})[#(Int32) -> Void#]{{; name=.+$}}
265+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc2({#(self): FooClassDerived#})[#(Int32, withB: Int32) -> Void#]{{; name=.+$}}
266+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFuncOverridden({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
267+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/CurrNominal: .fooClassFunc0()[#Void#]{{; name=.+$}}
268+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ()[#FooClassDerived!#]
269+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ({#float: Float#})[#FooClassDerived!#]{{; name=.+$}}
270+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooProtoFunc({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
271+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation1({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
272+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation2({#(self): FooClassDerived#})[#() -> Void#]{{; name=.+$}}
273+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/CurrNominal: .fooProtoClassFunc()[#Void#]{{; name=.+$}}
274+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: .fooBaseInstanceFunc0()[#Void#]{{; name=.+$}}
275+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc0({#(self): FooClassBase#})[#() -> Void#]{{; name=.+$}}
276+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: .fooBaseInstanceFunc1({#(anObject): Any!#})[#FooClassBase!#]{{; name=.+$}}
277+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc1({#(self): FooClassBase#})[#(Any?) -> FooClassBase?#]{{; name=.+$}}
278+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: .fooBaseInstanceFuncOverridden()[#Void#]{{; name=.+$}}
279+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: .fooBaseClassFunc0()[#Void#]{{; name=.+$}}
280+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: ._internalMeth3()[#Any!#]
281+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/Super: ._internalMeth3({#(self): FooClassBase#})[#() -> Any?#]
282+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: ._internalMeth2()[#Any!#]
283+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/Super: ._internalMeth2({#(self): FooClassBase#})[#() -> Any?#]
284+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: .nonInternalMeth()[#Any!#]
285+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/Super: .nonInternalMeth({#(self): FooClassBase#})[#() -> Any?#]
286+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[StaticMethod]/Super: ._internalMeth1()[#Any!#]
287+
// CLANG_CLASS_MEMBERS_2-DAG: Decl[InstanceMethod]/Super: ._internalMeth1({#(self): FooClassBase#})[#() -> Any?#]
288+
// CLANG_CLASS_MEMBERS_2-DAG: Keyword[self]/CurrNominal: .self[#FooClassDerived.Type#]; name=self
289+
// CLANG_CLASS_MEMBERS_2-DAG: Keyword/CurrNominal: .Type[#FooClassDerived.Type#]; name=Type
290290
}
291291

292292
func testCompleteInstanceMembers1(fooObject: FooClassDerived) {
293293
fooObject#^CLANG_INSTANCE_MEMBERS_1^#
294-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceVar]/CurrNominal: .fooProperty1[#Int32#]{{; name=.+$}}
295-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceVar]/CurrNominal: .fooProperty2[#Int32#]{{; name=.+$}}
296-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceVar]/CurrNominal: .fooProperty3[#Int32#]{{; name=.+$}}
297-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc0()[#Void#]{{; name=.+$}}
298-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc1({#(a): Int32#})[#Void#]{{; name=.+$}}
299-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc2({#(a): Int32#}, {#withB: Int32#})[#Void#]{{; name=.+$}}
300-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFuncOverridden()[#Void#]{{; name=.+$}}
301-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooProtoFunc()[#Void#]{{; name=.+$}}
302-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation1()[#Void#]{{; name=.+$}}
303-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation2()[#Void#]{{; name=.+$}}
304-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc0()[#Void#]{{; name=.+$}}
305-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc1({#(anObject): Any!#})[#FooClassBase!#]{{; name=.+$}}
306-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/Super: ._internalMeth3()[#Any!#]
307-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/Super: ._internalMeth2()[#Any!#]
308-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/Super: .nonInternalMeth()[#Any!#]
309-
// CLANG_INSTANCE_MEMBERS_1-NEXT: Decl[InstanceMethod]/Super: ._internalMeth1()[#Any!#]
294+
// CLANG_INSTANCE_MEMBERS_1-NOT: Instance
295+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceVar]/CurrNominal: .fooProperty1[#Int32#]{{; name=.+$}}
296+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceVar]/CurrNominal: .fooProperty2[#Int32#]{{; name=.+$}}
297+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceVar]/CurrNominal: .fooProperty3[#Int32#]{{; name=.+$}}
298+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc0()[#Void#]{{; name=.+$}}
299+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc1({#(a): Int32#})[#Void#]{{; name=.+$}}
300+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooInstanceFunc2({#(a): Int32#}, {#withB: Int32#})[#Void#]{{; name=.+$}}
301+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooBaseInstanceFuncOverridden()[#Void#]{{; name=.+$}}
302+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooProtoFunc()[#Void#]{{; name=.+$}}
303+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation1()[#Void#]{{; name=.+$}}
304+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/CurrNominal: .fooProtoFuncWithExtraIndentation2()[#Void#]{{; name=.+$}}
305+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc0()[#Void#]{{; name=.+$}}
306+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/Super: .fooBaseInstanceFunc1({#(anObject): Any!#})[#FooClassBase!#]{{; name=.+$}}
307+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/Super: ._internalMeth3()[#Any!#]
308+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/Super: ._internalMeth2()[#Any!#]
309+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/Super: .nonInternalMeth()[#Any!#]
310+
// CLANG_INSTANCE_MEMBERS_1-DAG: Decl[InstanceMethod]/Super: ._internalMeth1()[#Any!#]
310311
// CLANG_INSTANCE_MEMBERS_1-NOT: Instance
311312
}
312313

0 commit comments

Comments
 (0)