Merge pull request #19938 from rockbruno/swift-keypath-index

[Index] Fully index Swift Keypaths referencing @objc properties

Author: akyrtzi

lib/AST/ASTWalker.cpp

@@ -972,7 +972,6 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
       Expr *sub = doIt(objcStringLiteral);
       if (!sub) return nullptr;
       E->setObjCStringLiteralExpr(sub);
-      return E;
     }
 
     auto components = E->getComponents();

test/Index/index_keypaths.swift

@@ -0,0 +1,27 @@
+// RUN: %target-swift-ide-test -print-indexed-symbols -source-filename %s | %FileCheck %s
+// REQUIRES: objc_interop
+
+struct MyStruct {
+  struct Inner {
+    let myProp = 1
+  }
+}
+
+class MyClass {
+  class Inner {
+    @objc var myProp = 1
+  }
+}
+
+let a = \MyStruct.Inner.myProp
+// CHECK: [[@LINE-1]]:25 | {{.*}} | myProp
+// CHECK: [[@LINE-2]]:10 | {{.*}} | MyStruct
+// CHECK: [[@LINE-3]]:19 | {{.*}} | Inner
+let b: KeyPath<MyStruct.Inner, Int> = \.myProp
+// CHECK: [[@LINE-1]]:41 | {{.*}} | myProp
+let c = \MyClass.Inner.myProp
+// CHECK: [[@LINE-1]]:24 | {{.*}} | myProp
+// CHECK: [[@LINE-2]]:10 | {{.*}} | MyClass
+// CHECK: [[@LINE-3]]:18 | {{.*}} | Inner
+let d: KeyPath<MyClass.Inner, Int> = \.myProp
+// CHECK: [[@LINE-1]]:40 | {{.*}} | myProp