Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Index] Fully index Swift Keypaths referencing @objc properties #19938

Merged
merged 6 commits into from Oct 23, 2018
Merged

[Index] Fully index Swift Keypaths referencing @objc properties #19938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e04b034
Merge remote-tracking branch 'apple/master'
Mar 10, 2018
e1ac19d
Merge remote-tracking branch 'apple/master'
rockbruno Aug 31, 2018
cc48d84
Merge remote-tracking branch 'apple/master'
rockbruno Aug 31, 2018
564a451
Merge remote-tracking branch 'apple/master'
rockbruno Sep 12, 2018
5c3535f
Merge remote-tracking branch 'upstream/master'
rockbruno Oct 16, 2018
32c5935
Indexing Swift @objc key paths
rockbruno Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/AST/ASTWalker.cpp
View file
Open in desktop
Expand Up @@ -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();
Expand Down
27 changes: 27 additions & 0 deletions test/Index/index_keypaths.swift
View file
Open in desktop
@@ -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