[IDE] Adjust more test cases

Author: ahoppen

test/IDE/complete_in_closures.swift

@@ -567,12 +567,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
 }
 

test/IDE/complete_in_result_builder.swift

@@ -64,7 +64,7 @@ func testGlobalLookup() {
   @TupleBuilder<String> var x5 {
     "hello: \(#^GLOBAL_LOOKUP_IN_STRING_LITERAL^#)"
 // GLOBAL_LOOKUP_IN_STRING_LITERAL: Begin completions
-// GLOBAL_LOOKUP_IN_STRING_LITERAL: Decl[GlobalVar]/CurrModule: MyConstantString[#String#];
+// GLOBAL_LOOKUP_IN_STRING_LITERAL: Decl[GlobalVar]/CurrModule/TypeRelation[Convertible]: MyConstantString[#String#];
 // GLOBAL_LOOKUP_IN_STRING_LITERAL: End completions
   }
 
@@ -99,7 +99,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
   }
 }
@@ -217,7 +217,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
 // STRING_LITERAL_VAR: End completions
   }
 

test/IDE/complete_issue-56811.swift

@@ -15,5 +15,5 @@ public enum Endpoint {
   }
 }
 // CHECK: Begin completions
-// CHECK: Decl[LocalVar]/Local: myInt[#Int#];
+// CHECK: Decl[LocalVar]/Local/TypeRelation[Convertible]: myInt[#Int#];
 // CHECK: End completions

test/IDE/complete_rdar63965160.swift

@@ -32,12 +32,7 @@ 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#];
-// STRINGLITERAL: End completions
-
-// NORMAL: Begin completions, 2 items
-// NORMAL-DAG: Keyword[self]/CurrNominal:          self[#Value#];
-// NORMAL-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];
-// NORMAL: End completions
+// CHECK: Begin completions, 2 items
+// CHECK-DAG: Keyword[self]/CurrNominal:          self[#Value#];
+// CHECK-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];
+// CHECK: End completions

test/IDE/complete_value_expr.swift

@@ -1245,8 +1245,8 @@ func testInterpolatedString1() {
 }
 
 // INTERPOLATED_STRING_1: Begin completions
-// 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=.+$}}

validation-test/IDE/issues_fixed/issue-57041.swift

@@ -72,6 +72,6 @@ struct SplitView: View2 {
 }
 
 // COMPLETE: Begin completions
-// 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:)
 // COMPLETE: End completions

validation-test/IDE/stress_tester_issues_fixed/issue-57058.swift

@@ -32,5 +32,5 @@ 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
 // CHECK: End completions