Merge pull request #75123 from hamishknight/solvar-6.0

[6.0] [CursorInfo] Resolve solver-based in VarDecls

Author: hamishknight

lib/IDE/CursorInfo.cpp

@@ -174,7 +174,12 @@ class NodeFinder : ASTWalker {
   }
 
   PreWalkAction walkToDeclPre(Decl *D) override {
-    if (!rangeContainsLocToResolve(D->getSourceRangeIncludingAttrs())) {
+    // If the decl doesn't contain the location to resolve, we can skip walking
+    // it. One exception to this is for VarDecls, they can contain accessors
+    // which are not included in their SourceRange. For e.g `var x: Int { 0 }`,
+    // the VarDecl's range is just `x`, but the location may be in the accessor.
+    if (!isa<VarDecl>(D) &&
+        !rangeContainsLocToResolve(D->getSourceRangeIncludingAttrs())) {
       return Action::SkipNode();
     }
 

test/SourceKit/CursorInfo/rdar131135631.swift

@@ -0,0 +1,12 @@
+func foo(_ x: Int) -> Int {}
+func foo(_ x: String) -> Int {}
+
+// rdar://131135631 - Make sure we can resolve solver-based cursor info in a
+// VarDecl's accessor.
+var x: Int {
+  // RUN: %sourcekitd-test -req=cursor -pos=%(line + 1):3 %s -- %s | %FileCheck %s
+  foo()
+}
+
+// CHECK-DAG: source.lang.swift.ref.function.free (1:6-1:19)
+// CHECK-DAG: source.lang.swift.ref.function.free (2:6-2:22)