[IDE] Adjust more test cases

ahoppen · ahoppen · commit d735debc4407 · 2023-03-23T09:23:39.000-07:00
diff --git a/test/IDE/complete_in_closures.swift b/test/IDE/complete_in_closures.swift
@@ -543,12 +543,9 @@ func testCompleteAfterClosureWithIfExprThatContainErrors() {
     }
   }#^AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS^#
 
-  // FIXME: We shouldn't be suggesting 'self' and '()' twice here
-  // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS: Begin completions, 4 items
+  // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS: Begin completions, 2 items
   // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Keyword[self]/CurrNominal:          .self[#() -> _#]; name=self
-  // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Keyword[self]/CurrNominal:          .self[#() -> ()#]; name=self
   // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Pattern/CurrModule/Flair[ArgLabels]: ()[#_#]; name=()
-  // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Pattern/CurrModule/Flair[ArgLabels]: ()[#Void#]; name=()
   // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS: End completions
 }
 
diff --git a/test/IDE/complete_in_result_builder.swift b/test/IDE/complete_in_result_builder.swift
@@ -59,7 +59,7 @@ func testGlobalLookup() {
 
   @TupleBuilder<String> var x5 {
     "hello: \(#^GLOBAL_LOOKUP_IN_STRING_LITERAL^#)"
-// GLOBAL_LOOKUP_IN_STRING_LITERAL: Decl[GlobalVar]/CurrModule: MyConstantString[#String#];
+// GLOBAL_LOOKUP_IN_STRING_LITERAL: Decl[GlobalVar]/CurrModule/TypeRelation[Convertible]: MyConstantString[#String#];
   }
 
   @TupleBuilder<String> var x5 {
@@ -87,7 +87,7 @@ func testStaticMemberLookup() {
   @TupleBuilder<String> var x3 {
     "hello: \(StringFactory.#^COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL^#)"
 // COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: Begin completions
-// COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: Decl[StaticMethod]/CurrNominal:     makeString({#x: String#})[#String#];
+// COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: Decl[StaticMethod]/CurrNominal/TypeRelation[Convertible]:     makeString({#x: String#})[#String#];
 // COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: End completions
   }
 }
@@ -197,7 +197,7 @@ func testCompleteInStringLiteral() {
     }
 // STRING_LITERAL_VAR: Begin completions, 2 items
 // STRING_LITERAL_VAR-DAG: Keyword[self]/CurrNominal:          self[#Island#]; name=self
-// STRING_LITERAL_VAR-DAG: Decl[InstanceVar]/CurrNominal: turnipPrice[#String#]; name=turnipPrice
+// STRING_LITERAL_VAR-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: turnipPrice[#String#]; name=turnipPrice
   }
 
   func bar(island: Island) {
diff --git a/test/IDE/complete_issue-56811.swift b/test/IDE/complete_issue-56811.swift
@@ -14,4 +14,4 @@ public enum Endpoint {
     }
   }
 }
-// CHECK: Decl[LocalVar]/Local: myInt[#Int#];
+// CHECK: Decl[LocalVar]/Local/TypeRelation[Convertible]: myInt[#Int#];
diff --git a/test/IDE/complete_rdar63965160.swift b/test/IDE/complete_rdar63965160.swift
@@ -32,10 +32,6 @@ func test(values: [Value]) {
     Text(value.#^NORMAL?check=CHECK^#)
   }
 }
-// STRINGLITERAL: Begin completions, 2 items
-// STRINGLITERAL-DAG: Keyword[self]/CurrNominal:          self[#Value#];
-// STRINGLITERAL-DAG: Decl[InstanceVar]/CurrNominal: name[#String#];
-
-// NORMAL: Begin completions, 2 items
-// NORMAL-DAG: Keyword[self]/CurrNominal:          self[#Value#];
-// NORMAL-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];
+// CHECK: Begin completions, 2 items
+// CHECK-DAG: Keyword[self]/CurrNominal:          self[#Value#];
+// CHECK-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];
diff --git a/test/IDE/complete_value_expr.swift b/test/IDE/complete_value_expr.swift
@@ -1122,8 +1122,8 @@ func testInterpolatedString1() {
   "\(fooObject.#^INTERPOLATED_STRING_1^#)"
 }
 
-// INTERPOLATED_STRING_1-DAG: Decl[InstanceVar]/CurrNominal:      lazyInstanceVar[#Int#]{{; name=.+$}}
-// INTERPOLATED_STRING_1-DAG: Decl[InstanceVar]/CurrNominal:      instanceVar[#Int#]{{; name=.+$}}
+// INTERPOLATED_STRING_1-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]:      lazyInstanceVar[#Int#]{{; name=.+$}}
+// INTERPOLATED_STRING_1-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]:      instanceVar[#Int#]{{; name=.+$}}
 // INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc0()[#Void#]{{; name=.+$}}
 // INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc1({#(a): Int#})[#Void#]{{; name=.+$}}
 // INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc2({#(a): Int#}, {#b: &Double#})[#Void#]{{; name=.+$}}
diff --git a/validation-test/IDE/issues_fixed/issue-57041.swift b/validation-test/IDE/issues_fixed/issue-57041.swift
@@ -71,5 +71,5 @@ struct SplitView: View2 {
   }
 }
 
-// COMPLETE-DAG: Decl[InstanceMethod]/Super: frame()[#Never#]; name=frame()
-// COMPLETE-DAG: Decl[InstanceMethod]/Super: frame({#width: Int?#}, {#height: Int?#})[#Never#]; name=frame(width:height:)
+// COMPLETE-DAG: Decl[InstanceMethod]/Super/TypeRelation[Convertible]: frame()[#Never#]; name=frame()
+// COMPLETE-DAG: Decl[InstanceMethod]/Super/TypeRelation[Convertible]: frame({#width: Int?#}, {#height: Int?#})[#Never#]; name=frame(width:height:)
diff --git a/validation-test/IDE/stress_tester_issues_fixed/issue-57058.swift b/validation-test/IDE/stress_tester_issues_fixed/issue-57058.swift
@@ -32,4 +32,4 @@ struct MysteryIslandDetail {
 
 // CHECK: Begin completions, 2 items
 // CHECK-DAG: Keyword[self]/CurrNominal:          self[#MysteryIsland2#]; name=self
-// CHECK-DAG: Decl[InstanceVar]/CurrNominal: chance[#Int#]; name=chance
+// CHECK-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: chance[#Int#]; name=chance

Original file line number	Diff line number	Diff line change
`@@ -543,12 +543,9 @@ func testCompleteAfterClosureWithIfExprThatContainErrors() {`
`543`	`543`	`}`
`544`	`544`	`}#^AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS^#`
`545`	`545`
`546`		`- // FIXME: We shouldn't be suggesting 'self' and '()' twice here`
`547`		`- // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS: Begin completions, 4 items`
	`546`	`+ // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS: Begin completions, 2 items`
`548`	`547`	`// AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Keyword[self]/CurrNominal: .self[#() -> _#]; name=self`
`549`		`- // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Keyword[self]/CurrNominal: .self[#() -> ()#]; name=self`
`550`	`548`	`// AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Pattern/CurrModule/Flair[ArgLabels]: ()[#_#]; name=()`
`551`		`- // AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS-DAG: Pattern/CurrModule/Flair[ArgLabels]: ()[#Void#]; name=()`
`552`	`549`	`// AFTER_CLOSURE_WITH_IF_EXPR_THAT_CONTAIN_ERRORS: End completions`
`553`	`550`	`}`
`554`	`551`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func testGlobalLookup() {`
`59`	`59`
`60`	`60`	`@TupleBuilder<String> var x5 {`
`61`	`61`	`"hello: \(#^GLOBAL_LOOKUP_IN_STRING_LITERAL^#)"`
`62`		`-// GLOBAL_LOOKUP_IN_STRING_LITERAL: Decl[GlobalVar]/CurrModule: MyConstantString[#String#];`
	`62`	`+// GLOBAL_LOOKUP_IN_STRING_LITERAL: Decl[GlobalVar]/CurrModule/TypeRelation[Convertible]: MyConstantString[#String#];`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@TupleBuilder<String> var x5 {`
`@@ -87,7 +87,7 @@ func testStaticMemberLookup() {`
`87`	`87`	`@TupleBuilder<String> var x3 {`
`88`	`88`	`"hello: \(StringFactory.#^COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL^#)"`
`89`	`89`	`// COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: Begin completions`
`90`		`-// COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: Decl[StaticMethod]/CurrNominal: makeString({#x: String#})[#String#];`
	`90`	`+// COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: Decl[StaticMethod]/CurrNominal/TypeRelation[Convertible]: makeString({#x: String#})[#String#];`
`91`	`91`	`// COMPLETE_STATIC_MEMBER_IN_STRING_LITERAL: End completions`
`92`	`92`	`}`
`93`	`93`	`}`
`@@ -197,7 +197,7 @@ func testCompleteInStringLiteral() {`
`197`	`197`	`}`
`198`	`198`	`// STRING_LITERAL_VAR: Begin completions, 2 items`
`199`	`199`	`// STRING_LITERAL_VAR-DAG: Keyword[self]/CurrNominal: self[#Island#]; name=self`
`200`		`-// STRING_LITERAL_VAR-DAG: Decl[InstanceVar]/CurrNominal: turnipPrice[#String#]; name=turnipPrice`
	`200`	`+// STRING_LITERAL_VAR-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: turnipPrice[#String#]; name=turnipPrice`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`func bar(island: Island) {`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ public enum Endpoint {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
`17`		`-// CHECK: Decl[LocalVar]/Local: myInt[#Int#];`
	`17`	`+// CHECK: Decl[LocalVar]/Local/TypeRelation[Convertible]: myInt[#Int#];`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,6 @@ func test(values: [Value]) {`
`32`	`32`	`Text(value.#^NORMAL?check=CHECK^#)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`-// STRINGLITERAL: Begin completions, 2 items`
`36`		`-// STRINGLITERAL-DAG: Keyword[self]/CurrNominal: self[#Value#];`
`37`		`-// STRINGLITERAL-DAG: Decl[InstanceVar]/CurrNominal: name[#String#];`
`38`		`-`
`39`		`-// NORMAL: Begin completions, 2 items`
`40`		`-// NORMAL-DAG: Keyword[self]/CurrNominal: self[#Value#];`
`41`		`-// NORMAL-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];`
	`35`	`+// CHECK: Begin completions, 2 items`
	`36`	`+// CHECK-DAG: Keyword[self]/CurrNominal: self[#Value#];`
	`37`	`+// CHECK-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,5 @@ struct SplitView: View2 {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`-// COMPLETE-DAG: Decl[InstanceMethod]/Super: frame()[#Never#]; name=frame()`
`75`		`-// COMPLETE-DAG: Decl[InstanceMethod]/Super: frame({#width: Int?#}, {#height: Int?#})[#Never#]; name=frame(width:height:)`
	`74`	`+// COMPLETE-DAG: Decl[InstanceMethod]/Super/TypeRelation[Convertible]: frame()[#Never#]; name=frame()`
	`75`	`+// COMPLETE-DAG: Decl[InstanceMethod]/Super/TypeRelation[Convertible]: frame({#width: Int?#}, {#height: Int?#})[#Never#]; name=frame(width:height:)`