Allow #keyPath() to resolve type refs

rockbruno · rockbruno · commit df64e8a5dcd9 · 2018-10-24T17:13:54.000-03:00
diff --git a/include/swift/AST/Expr.h b/include/swift/AST/Expr.h
@@ -4775,6 +4775,7 @@ class KeyPathExpr : public Expr {
       OptionalChain,
       OptionalWrap,
       Identity,
+      Type,
     };
   
   private:
@@ -4871,7 +4872,17 @@ class KeyPathExpr : public Expr {
                        propertyType,
                        loc);
     }
-    
+
+    /// Create a component for a type.
+    static Component forType(ConcreteDeclRef typeRef,
+                             Type type,
+                             SourceLoc loc) {
+      return Component(nullptr, typeRef, nullptr, {}, {},
+                       Kind::Type,
+                       type,
+                       loc);
+    }
+
     /// Create a component for a subscript.
     static Component forSubscript(ASTContext &ctx,
                               ConcreteDeclRef subscript,
@@ -4946,6 +4957,7 @@ class KeyPathExpr : public Expr {
       case Kind::OptionalForce:
       case Kind::Property:
       case Kind::Identity:
+      case Kind::Type:
         return true;
 
       case Kind::UnresolvedSubscript:
@@ -4969,6 +4981,7 @@ class KeyPathExpr : public Expr {
       case Kind::UnresolvedProperty:
       case Kind::Property:
       case Kind::Identity:
+      case Kind::Type:
         return nullptr;
       }
       llvm_unreachable("unhandled kind");
@@ -4987,6 +5000,7 @@ class KeyPathExpr : public Expr {
       case Kind::UnresolvedProperty:
       case Kind::Property:
       case Kind::Identity:
+      case Kind::Type:
         llvm_unreachable("no subscript labels for this kind");
       }
       llvm_unreachable("unhandled kind");
@@ -5008,6 +5022,7 @@ class KeyPathExpr : public Expr {
       case Kind::UnresolvedProperty:
       case Kind::Property:
       case Kind::Identity:
+      case Kind::Type:
         return {};
       }
       llvm_unreachable("unhandled kind");
@@ -5029,6 +5044,7 @@ class KeyPathExpr : public Expr {
       case Kind::OptionalForce:
       case Kind::Property:
       case Kind::Identity:
+      case Kind::Type:
         llvm_unreachable("no unresolved name for this kind");
       }
       llvm_unreachable("unhandled kind");
@@ -5038,6 +5054,7 @@ class KeyPathExpr : public Expr {
       switch (getKind()) {
       case Kind::Property:
       case Kind::Subscript:
+      case Kind::Type:
         return Decl.ResolvedDecl;
 
       case Kind::Invalid:
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -2610,10 +2610,15 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
         component.getIndexExpr()->print(OS, Indent + 4);
         OS.indent(Indent + 4);
         break;
+
       case KeyPathExpr::Component::Kind::Identity:
         OS << "identity";
         OS << '\n';
         break;
+
+      case KeyPathExpr::Component::Kind::Type:
+        OS << "type_ref ";
+        break;
       }
       OS << "type=";
       component.getComponentType().print(OS);
diff --git a/lib/AST/ASTWalker.cpp b/lib/AST/ASTWalker.cpp
@@ -1034,6 +1034,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
       case KeyPathExpr::Component::Kind::UnresolvedProperty:
       case KeyPathExpr::Component::Kind::Invalid:
       case KeyPathExpr::Component::Kind::Identity:
+      case KeyPathExpr::Component::Kind::Type:
         // No subexpr to visit.
         break;
       }
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
@@ -2179,6 +2179,7 @@ void KeyPathExpr::Component::setSubscriptIndexHashableConformances(
   case Kind::UnresolvedProperty:
   case Kind::Property:
   case Kind::Identity:
+  case Kind::Type:
     llvm_unreachable("no hashable conformances for this kind");
   }
 }
diff --git a/lib/IDE/SourceEntityWalker.cpp b/lib/IDE/SourceEntityWalker.cpp
@@ -348,7 +348,8 @@ std::pair<bool, Expr *> SemaAnnotator::walkToExprPre(Expr *E) {
     for (auto &component : KPE->getComponents()) {
       switch (component.getKind()) {
       case KeyPathExpr::Component::Kind::Property:
-      case KeyPathExpr::Component::Kind::Subscript: {
+      case KeyPathExpr::Component::Kind::Subscript:
+      case KeyPathExpr::Component::Kind::Type: {
         auto *decl = component.getDeclRef().getDecl();
         auto loc = component.getLoc();
         SourceRange range(loc, loc);
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
@@ -3816,7 +3816,8 @@ RValue RValueEmitter::visitKeyPathExpr(KeyPathExpr *E, SGFContext C) {
   for (auto &component : E->getComponents()) {
     switch (auto kind = component.getKind()) {
     case KeyPathExpr::Component::Kind::Property:
-    case KeyPathExpr::Component::Kind::Subscript: {
+    case KeyPathExpr::Component::Kind::Subscript:
+    case KeyPathExpr::Component::Kind::Type: {
       auto decl = cast<AbstractStorageDecl>(component.getDeclRef().getDecl());
 
       unsigned numOperands = operands.size();
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -295,8 +295,9 @@ static bool buildObjCKeyPathString(KeyPathExpr *E,
       buf.append(objcName.begin(), objcName.end());
       continue;
     }
-    case KeyPathExpr::Component::Kind::Subscript: {
-      // Subscripts aren't generally represented in KVC.
+    case KeyPathExpr::Component::Kind::Subscript:
+    case KeyPathExpr::Component::Kind::Type: {
+      // Subscripts and types aren't generally represented in KVC.
       // TODO: There are some subscript forms we could map to KVC, such as
       // when indexing a Dictionary or NSDictionary by string, or when applying
       // a mapping subscript operation to Array/Set or NSArray/NSSet.
@@ -4524,6 +4525,7 @@ namespace {
         case KeyPathExpr::Component::Kind::Property:
         case KeyPathExpr::Component::Kind::Subscript:
         case KeyPathExpr::Component::Kind::OptionalWrap:
+        case KeyPathExpr::Component::Kind::Type:
           llvm_unreachable("already resolved");
         }
       }
diff --git a/lib/Sema/CSDiag.cpp b/lib/Sema/CSDiag.cpp
@@ -6676,6 +6676,7 @@ static bool diagnoseKeyPathComponents(ConstraintSystem &CS, KeyPathExpr *KPE,
     case KeyPathExpr::Component::Kind::OptionalWrap:
     case KeyPathExpr::Component::Kind::Property:
     case KeyPathExpr::Component::Kind::Subscript:
+    case KeyPathExpr::Component::Kind::Type:
       llvm_unreachable("already resolved!");
     }
 
diff --git a/lib/Sema/CSGen.cpp b/lib/Sema/CSGen.cpp
@@ -3005,7 +3005,8 @@ namespace {
         case KeyPathExpr::Component::Kind::UnresolvedProperty:
         // This should only appear in resolved ASTs, but we may need to
         // re-type-check the constraints during failure diagnosis.
-        case KeyPathExpr::Component::Kind::Property: {
+        case KeyPathExpr::Component::Kind::Property:
+        case KeyPathExpr::Component::Kind::Type: {
           auto memberTy = CS.createTypeVariable(locator, TVO_CanBindToLValue);
           auto lookupName = kind == KeyPathExpr::Component::Kind::UnresolvedProperty
             ? component.getUnresolvedDeclName()
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -643,6 +643,7 @@ getCalleeDeclAndArgs(ConstraintSystem &cs,
     case KeyPathExpr::Component::Kind::OptionalChain:
     case KeyPathExpr::Component::Kind::OptionalWrap:
     case KeyPathExpr::Component::Kind::Identity:
+    case KeyPathExpr::Component::Kind::Type:
       return std::make_tuple(nullptr, /*hasCurriedSelf=*/false, argLabels,
                              hasTrailingClosure);
     }
@@ -4152,6 +4153,7 @@ ConstraintSystem::simplifyKeyPathConstraint(Type keyPathTy,
       
     case KeyPathExpr::Component::Kind::Property:
     case KeyPathExpr::Component::Kind::Subscript:
+    case KeyPathExpr::Component::Kind::Type:
     case KeyPathExpr::Component::Kind::UnresolvedProperty:
     case KeyPathExpr::Component::Kind::UnresolvedSubscript: {
       // If no choice was made, leave the constraint unsolved.
diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
@@ -2433,7 +2433,8 @@ class AvailabilityWalker : public ASTWalker {
     for (auto &component : KP->getComponents()) {
       switch (component.getKind()) {
       case KeyPathExpr::Component::Kind::Property:
-      case KeyPathExpr::Component::Kind::Subscript: {
+      case KeyPathExpr::Component::Kind::Subscript:
+      case KeyPathExpr::Component::Kind::Type: {
         auto *decl = component.getDeclRef().getDecl();
         auto loc = component.getLoc();
         SourceRange range(loc, loc);
diff --git a/lib/Sema/TypeCheckExprObjC.cpp b/lib/Sema/TypeCheckExprObjC.cpp
@@ -215,8 +215,16 @@ Optional<Type> TypeChecker::checkObjCKeyPathExpr(DeclContext *dc,
                diag::expr_unsupported_objc_key_path_component,
                (unsigned)kind);
       continue;
-    case KeyPathExpr::Component::Kind::OptionalWrap:
     case KeyPathExpr::Component::Kind::Property:
+    case KeyPathExpr::Component::Kind::Type: {
+      //For code completion purposes, we only care about the last expression.
+      if (&component == &expr->getComponents().back()) {
+        return component.getComponentType();
+      } else {
+        continue;
+      }
+    }
+    case KeyPathExpr::Component::Kind::OptionalWrap:
     case KeyPathExpr::Component::Kind::Subscript:
       llvm_unreachable("already resolved!");
     }
@@ -321,10 +329,11 @@ Optional<Type> TypeChecker::checkObjCKeyPathExpr(DeclContext *dc,
 
       // Resolve this component to the variable we found.
       auto varRef = ConcreteDeclRef(var);
+      Type type = var->getInterfaceType();
       auto resolved =
-        KeyPathExpr::Component::forProperty(varRef, Type(), componentNameLoc);
+        KeyPathExpr::Component::forProperty(varRef, type, componentNameLoc);
       resolvedComponents.push_back(resolved);
-      updateState(/*isProperty=*/true, var->getInterfaceType());
+      updateState(/*isProperty=*/true, type);
 
       // Check that the property is @objc.
       if (!var->isObjC()) {
@@ -388,6 +397,11 @@ Optional<Type> TypeChecker::checkObjCKeyPathExpr(DeclContext *dc,
         break;
       }
 
+      // Resolve this component to the type we found.
+      auto typeRef = ConcreteDeclRef(type);
+      auto resolved =
+      KeyPathExpr::Component::forType(typeRef, newType, componentNameLoc);
+      resolvedComponents.push_back(resolved);
       updateState(/*isProperty=*/false, newType);
       continue;
     }
diff --git a/test/IDE/complete_pound_keypath.swift b/test/IDE/complete_pound_keypath.swift
@@ -6,6 +6,8 @@
 
 // RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_KEYPATH_2 | %FileCheck -check-prefix=CHECK-IN_KEYPATH %s
 
+// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -code-completion -source-filename %s -code-completion-token=IN_KEYPATH_3 | %FileCheck -check-prefix=CHECK-IN_KEYPATH_3 %s
+
 
 // REQUIRES: objc_interop
 
@@ -34,6 +36,10 @@ func completeInKeyPath2() {
   _ = #keyPath(ObjCClass.#^IN_KEYPATH_2^#
 }
 
+func completeInKeyPath3() {
+  _ = #keyPath(ObjCClass.prop1.#^IN_KEYPATH_3^#
+}
+
 // CHECK-AFTER_POUND: Keyword/ExprSpecific:               keyPath({#@objc property sequence#}); name=keyPath(@objc property sequence)
 
 // CHECK-KEYPATH_ARG: Keyword/None:                       #keyPath({#@objc property sequence#}); name=#keyPath(@objc property sequence)
@@ -42,4 +48,5 @@ func completeInKeyPath2() {
 // CHECK-IN_KEYPATH: Decl[InstanceVar]/CurrNominal:      prop2[#ObjCClass?#]; name=prop2
 // CHECK-IN_KEYPATH: Decl[InstanceVar]/Super:            hashValue[#Int#]; name=hashValue
 
+// CHECK-IN_KEYPATH_3: Decl[InstanceVar]/CurrNominal:    hashValue[#Int#]; name=hashValue
 
diff --git a/test/Index/index_keypaths.swift b/test/Index/index_keypaths.swift
@@ -7,21 +7,31 @@ struct MyStruct {
   }
 }
 
-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
+
+class MyClass {
+  class Inner {
+    @objc var myProp = 1
+    func method() {
+      let c: String = #keyPath(myProp)
+      // CHECK: [[@LINE-1]]:32 | {{.*}} | myProp
+    }
+  }
+}
+
+let d: String = #keyPath(MyClass.Inner.myProp)
+// CHECK: [[@LINE-1]]:26 | {{.*}} | MyClass
+// CHECK: [[@LINE-2]]:34 | {{.*}} | Inner
+// CHECK: [[@LINE-3]]:40 | {{.*}} | myProp
+
+let e = \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
+let f: KeyPath<MyClass.Inner, Int> = \.myProp
 // CHECK: [[@LINE-1]]:40 | {{.*}} | myProp
diff --git a/test/expr/primary/keypath/keypath-objc.swift b/test/expr/primary/keypath/keypath-objc.swift
@@ -57,7 +57,7 @@ func testKeyPath(a: A, b: B) {
   let _: String = #keyPath(A.propString)
 
   // Property of String property (which looks on NSString)
-  let _: String = #keyPath(A.propString.URLsInText)
+  let _: String = #keyPath(A.propString.urlsInText)
 
   // String property with a suffix
   let _: String = #keyPath(A.propString).description
@@ -72,36 +72,36 @@ func testKeyPath(a: A, b: B) {
 
   // Array property (make sure we look at the array element).
   let _: String = #keyPath(A.propArray)
-  let _: String = #keyPath(A.propArray.URLsInText)
+  let _: String = #keyPath(A.propArray.urlsInText)
 
   // Dictionary property (make sure we look at the value type).
   let _: String = #keyPath(A.propDict.anyKeyName)
   let _: String = #keyPath(A.propDict.anyKeyName.propA)
 
   // Set property (make sure we look at the set element).
   let _: String = #keyPath(A.propSet)
-  let _: String = #keyPath(A.propSet.URLsInText)
+  let _: String = #keyPath(A.propSet.urlsInText)
 
   // AnyObject property
-  let _: String = #keyPath(A.propAnyObject.URLsInText)  
+  let _: String = #keyPath(A.propAnyObject.urlsInText)
   let _: String = #keyPath(A.propAnyObject.propA)  
   let _: String = #keyPath(A.propAnyObject.propB)  
   let _: String = #keyPath(A.propAnyObject.description)  
 
   // NSString property
-  let _: String = #keyPath(A.propNSString.URLsInText)  
+  let _: String = #keyPath(A.propNSString.urlsInText)
 
   // NSArray property (AnyObject array element).
   let _: String = #keyPath(A.propNSArray)
-  let _: String = #keyPath(A.propNSArray.URLsInText)
+  let _: String = #keyPath(A.propNSArray.urlsInText)
 
   // NSDictionary property (AnyObject value type).
   let _: String = #keyPath(A.propNSDict.anyKeyName)
   let _: String = #keyPath(A.propNSDict.anyKeyName.propA)
 
   // NSSet property (AnyObject set element).
   let _: String = #keyPath(A.propNSSet)
-  let _: String = #keyPath(A.propNSSet.URLsInText)
+  let _: String = #keyPath(A.propNSSet.urlsInText)
 
   // Property with keyword name.
   let _: String = #keyPath(A.repeat)

Original file line number	Diff line number	Diff line change
`@@ -1034,6 +1034,7 @@ class Traversal : public ASTVisitor<Traversal, Expr, Stmt,`
`1034`	`1034`	`case KeyPathExpr::Component::Kind::UnresolvedProperty:`
`1035`	`1035`	`case KeyPathExpr::Component::Kind::Invalid:`
`1036`	`1036`	`case KeyPathExpr::Component::Kind::Identity:`
	`1037`	`+ case KeyPathExpr::Component::Kind::Type:`
`1037`	`1038`	`// No subexpr to visit.`
`1038`	`1039`	`break;`
`1039`	`1040`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2179,6 +2179,7 @@ void KeyPathExpr::Component::setSubscriptIndexHashableConformances(`
`2179`	`2179`	`case Kind::UnresolvedProperty:`
`2180`	`2180`	`case Kind::Property:`
`2181`	`2181`	`case Kind::Identity:`
	`2182`	`+ case Kind::Type:`
`2182`	`2183`	`llvm_unreachable("no hashable conformances for this kind");`
`2183`	`2184`	`}`
`2184`	`2185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,8 +295,9 @@ static bool buildObjCKeyPathString(KeyPathExpr *E,`
`295`	`295`	`buf.append(objcName.begin(), objcName.end());`
`296`	`296`	`continue;`
`297`	`297`	`}`
`298`		`- case KeyPathExpr::Component::Kind::Subscript: {`
`299`		`- // Subscripts aren't generally represented in KVC.`
	`298`	`+ case KeyPathExpr::Component::Kind::Subscript:`
	`299`	`+ case KeyPathExpr::Component::Kind::Type: {`
	`300`	`+ // Subscripts and types aren't generally represented in KVC.`
`300`	`301`	`// TODO: There are some subscript forms we could map to KVC, such as`
`301`	`302`	`// when indexing a Dictionary or NSDictionary by string, or when applying`
`302`	`303`	`// a mapping subscript operation to Array/Set or NSArray/NSSet.`
`@@ -4524,6 +4525,7 @@ namespace {`
`4524`	`4525`	`case KeyPathExpr::Component::Kind::Property:`
`4525`	`4526`	`case KeyPathExpr::Component::Kind::Subscript:`
`4526`	`4527`	`case KeyPathExpr::Component::Kind::OptionalWrap:`
	`4528`	`+ case KeyPathExpr::Component::Kind::Type:`
`4527`	`4529`	`llvm_unreachable("already resolved");`
`4528`	`4530`	`}`
`4529`	`4531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6676,6 +6676,7 @@ static bool diagnoseKeyPathComponents(ConstraintSystem &CS, KeyPathExpr *KPE,`
`6676`	`6676`	`case KeyPathExpr::Component::Kind::OptionalWrap:`
`6677`	`6677`	`case KeyPathExpr::Component::Kind::Property:`
`6678`	`6678`	`case KeyPathExpr::Component::Kind::Subscript:`
	`6679`	`+ case KeyPathExpr::Component::Kind::Type:`
`6679`	`6680`	`llvm_unreachable("already resolved!");`
`6680`	`6681`	`}`
`6681`	`6682`