[CodeCompletion] Fix code completion issues related to type checking tap expressions in the cosntraint system

Author: ahoppen

lib/Sema/TypeCheckCodeCompletion.cpp

@@ -586,15 +586,6 @@ bool TypeChecker::typeCheckForCodeCompletion(
   if (!contextAnalyzer.hasCompletion())
     return false;
 
-  // Interpolation components are type-checked separately.
-  if (contextAnalyzer.locatedInStringInterpolation())
-    return false;
-
-  // FIXME: There is currently no way to distinguish between
-  // multi-statement closures which are result builder bodies
-  // (that are type-checked together with enclosing context)
-  // and regular closures which are type-checked separately.
-
   if (needsPrecheck) {
     // First, pre-check the expression, validating any types that occur in the
     // expression and folding sequence expressions.

test/IDE/complete_in_result_builder.swift

@@ -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/TypeRelation[Convertible]: turnipPrice[#String#]; name=turnipPrice
+// STRING_LITERAL_VAR-DAG: Decl[InstanceVar]/CurrNominal: turnipPrice[#String#]; name=turnipPrice
   }
 
   func bar(island: Island) {

test/IDE/complete_rdar63965160.swift

@@ -1,5 +1,5 @@
-// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token=STRINGLITERAL | %FileCheck %s
-// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token=NORMAL | %FileCheck %s
+// RUN: %empty-directory(%t)
+// RUN: %swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
 
 protocol View {}
 
@@ -32,6 +32,10 @@ func test(values: [Value]) {
     Text(value.#^NORMAL?check=CHECK^#)
   }
 }
-// CHECK: Begin completions, 2 items
-// CHECK-DAG: Keyword[self]/CurrNominal:          self[#Value#];
-// CHECK-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]: name[#String#];
+// 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#];

test/IDE/complete_value_expr.swift

@@ -1103,18 +1103,18 @@ func testResolveModules1() {
 //===--- Check that we can complete inside interpolated string literals
 
 func testInterpolatedString1() {
-  "\(fooObject.#^INTERPOLATED_STRING_1?check=FOO_OBJECT_DOT1^#)"
-}
-
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]:      lazyInstanceVar[#Int#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceVar]/CurrNominal/TypeRelation[Convertible]:      instanceVar[#Int#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc0()[#Void#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc1({#(a): Int#})[#Void#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc2({#(a): Int#}, {#b: &Double#})[#Void#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc3({#(a): Int#}, {#(Float, Double)#})[#Void#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc4({#(a): Int?#}, {#b: Int!#}, {#c: &Int?#}, {#d: &Int!#})[#Void#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal:   instanceFunc5()[#Int?#]{{; name=.+$}}
-// FOO_OBJECT_DOT1-DAG: Decl[InstanceMethod]/CurrNominal:   instanceFunc6()[#Int!#]{{; name=.+$}}
+  "\(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[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=.+$}}
+// INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc3({#(a): Int#}, {#(Float, Double)#})[#Void#]{{; name=.+$}}
+// INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal/TypeRelation[Invalid]: instanceFunc4({#(a): Int?#}, {#b: Int!#}, {#c: &Int?#}, {#d: &Int!#})[#Void#]{{; name=.+$}}
+// INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal:   instanceFunc5()[#Int?#]{{; name=.+$}}
+// INTERPOLATED_STRING_1-DAG: Decl[InstanceMethod]/CurrNominal:   instanceFunc6()[#Int!#]{{; name=.+$}}
 
 //===--- Check protocol extensions
 

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/TypeRelation[Convertible]: chance[#Int#]; name=chance
+// CHECK-DAG: Decl[InstanceVar]/CurrNominal: chance[#Int#]; name=chance