[CodeCompletion] Don’t pass LeaveClosureBodiesUnchecked for solver-based code completion

Author: ahoppen

lib/Sema/TypeCheckCodeCompletion.cpp

@@ -307,7 +307,9 @@ getTypeOfExpressionWithoutApplying(Expr *&expr, DeclContext *dc,
 
   ConstraintSystemOptions options;
   options |= ConstraintSystemFlags::SuppressDiagnostics;
-  options |= ConstraintSystemFlags::LeaveClosureBodyUnchecked;
+  if (!Context.CompletionCallback) {
+    options |= ConstraintSystemFlags::LeaveClosureBodyUnchecked;
+  }
 
   // Construct a constraint system from this expression.
   ConstraintSystem cs(dc, options);
@@ -400,7 +402,6 @@ getTypeOfCompletionOperatorImpl(DeclContext *DC, Expr *expr,
 
   ConstraintSystemOptions options;
   options |= ConstraintSystemFlags::SuppressDiagnostics;
-  options |= ConstraintSystemFlags::LeaveClosureBodyUnchecked;
 
   // Construct a constraint system from this expression.
   ConstraintSystem CS(DC, options);
@@ -612,8 +613,9 @@ bool TypeChecker::typeCheckForCodeCompletion(
     options |= ConstraintSystemFlags::AllowFixes;
     options |= ConstraintSystemFlags::SuppressDiagnostics;
     options |= ConstraintSystemFlags::ForCodeCompletion;
-    options |= ConstraintSystemFlags::LeaveClosureBodyUnchecked;
-
+    if (!Context.CompletionCallback) {
+      options |= ConstraintSystemFlags::LeaveClosureBodyUnchecked;
+    }
 
     ConstraintSystem cs(DC, options);
 

lib/Sema/TypeCheckStmt.cpp

@@ -2421,8 +2421,9 @@ bool TypeCheckASTNodeAtLocRequest::evaluate(
     }
   }
 
-  TypeChecker::typeCheckASTNode(finder.getRef(), DC,
-                                /*LeaveBodyUnchecked=*/true);
+  bool LeaveBodyUnchecked = !ctx.CompletionCallback;
+
+  TypeChecker::typeCheckASTNode(finder.getRef(), DC, LeaveBodyUnchecked);
   return false;
 }
 

test/IDE/complete_in_closures.swift

@@ -104,7 +104,7 @@ struct NestedStructWithClosureMember1 {
 struct StructWithClosureMemberAndLocal {
   var c = {
     var x = 0
-    #^DELAYED_10?check=WITH_GLOBAL_DECLS_AND_LOCAL1;xfail=https://github.com/apple/swift/issues/58273^#
+    #^DELAYED_10?check=WITH_GLOBAL_DECLS_AND_LOCAL1^#
   }
 }
 

test/IDE/complete_skipbody.swift

@@ -45,8 +45,6 @@ func test(valueOptOpt: MyStruct??) {
     case let x where x < 2:
       let unrelated3 = FORBIDDEN_Struct()
       _ = { xx in
-        let unrelated4 = FORBIDDEN_Struct()
-
         if xx == localFunc(value.#^FUNCTIONBODY^#) {
           let unrelated5 = FORBIDDEN_Struct()
           return 1

test/IDE/complete_with_trailing_closure.swift

@@ -16,10 +16,20 @@ func sink(receiveValue: (MyArray) -> Void) {
 func foo() {
   sink { items in
     let a = items.#^COMPLETE_WITHOUT_SPACE?check=CHECK^#map{ $0.content }
+  }
+  sink { items in
     let b = items.#^COMPLETE_WITH_SPACE?check=CHECK^# map{ $0.content }
+  }
+  sink { items in
     let c = items.#^COMPLETE_WITH_SPACE_AND_PARENS?check=CHECK^# map({ $0.content })
+  }
+  sink { items in
     let d = items.#^COMPLETE_WITHOUT_SPACE_BUT_PARENS?check=CHECK^#map({ $0.content })
+  }
+  sink { items in
     let e = items.#^COMPLETE_WITHOUT_MAP?check=CHECK^# { $0.content }
+  }
+  sink { items in
     let f = items.#^COMPLETE_WITHOUT_MAP_BUT_PARENS?check=CHECK^# ({ $0.content })
   }
 }