[IDE] Don't set LeaveClosureBodiesUnchecked for solver-based cursor info

Author: ahoppen

lib/IDE/CursorInfo.cpp

@@ -34,6 +34,9 @@ namespace {
 // MARK: - Utilities
 
 void typeCheckDeclAndParentClosures(ValueDecl *VD) {
+  if (!VD) {
+    return;
+  }
   // We need to type check any parent closures because their types are
   // encoded in the USR of ParentContexts in the cursor info response.
   auto DC = VD->getDeclContext();

lib/Sema/TypeCheckStmt.cpp

@@ -2393,8 +2393,6 @@ bool TypeCheckASTNodeAtLocRequest::evaluate(
     }
   }
 
-  bool LeaveBodyUnchecked = !ctx.CompletionCallback;
-
   // The enclosing closure might be a single expression closure or a function
   // builder closure. In such cases, the body elements are type checked with
   // the closure itself. So we need to try type checking the enclosing closure
@@ -2418,17 +2416,13 @@ bool TypeCheckASTNodeAtLocRequest::evaluate(
       auto ActorIsolation = determineClosureActorIsolation(
           CE, __Expr_getType, __AbstractClosureExpr_getActorIsolation);
       CE->setActorIsolation(ActorIsolation);
-      if (!LeaveBodyUnchecked) {
-        // Type checking the parent closure also type checked this node.
-        // Nothing to do anymore.
-        return false;
-      }
-      if (CE->getBodyState() != ClosureExpr::BodyState::ReadyForTypeChecking)
-        return false;
+      // Type checking the parent closure also type checked this node.
+      // Nothing to do anymore.
+      return false;
     }
   }
 
-  TypeChecker::typeCheckASTNode(finder.getRef(), DC, LeaveBodyUnchecked);
+  TypeChecker::typeCheckASTNode(finder.getRef(), DC, /*LeaveBodyUnchecked=*/false);
   return false;
 }
 

test/SourceKit/CursorInfo/cursor_in_closure.swift

@@ -0,0 +1,13 @@
+struct MyStruct {
+  var identifier: String
+}
+
+func takeClosure(_ x: () -> Void) {}
+
+func test() {
+  takeClosure {
+    let foo = MyStruct()
+    // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):5 %s -- %s
+    foo.identifier = "\(item.category)#\(item.name)"
+  }
+}