[IDE] Run RecontextualizeClosures in TypeCheckASTNodeAtLocRequest

Author: ahoppen

lib/Sema/TypeCheckStmt.cpp

@@ -1876,10 +1876,17 @@ bool TypeCheckASTNodeAtLocRequest::evaluate(
         auto i = patternInit->getBindingIndex();
         PBD->getPattern(i)->forEachVariable(
             [](VarDecl *VD) { (void)VD->getInterfaceType(); });
-        if (PBD->getInit(i)) {
+        if (auto Init = PBD->getInit(i)) {
           if (!PBD->isInitializerChecked(i)) {
             typeCheckPatternBinding(PBD, i,
                                     /*LeaveClosureBodyUnchecked=*/true);
+            // Retrieve the accessor's body to trigger RecontextualizeClosures
+            // This is important to get the correct USR of variables defined
+            // in closures initializing lazy variables.
+            PBD->getPattern(i)->forEachVariable([](VarDecl *VD) {
+              VD->visitEmittedAccessors(
+                  [&](AccessorDecl *accessor) { (void)accessor->getBody(); });
+            });
             return false;
           }
         }

test/SourceKit/CursorInfo/cursor_in_closure_initializing_var.swift

@@ -0,0 +1,10 @@
+// RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s | %FileCheck %s
+
+class MyClass {
+    lazy var calculatorContext: Int = {
+        let context = 1
+        return context
+    }()
+}
+
+// CHECK: s:34cursor_in_closure_initializing_var7MyClassC17calculatorContextSivgSiyXEfU_7contextL_Sivp