Skip to content

[indexer] Fix missing references for inherits of associated types #7846

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 2, 2017
Merged

[indexer] Fix missing references for inherits of associated types #7846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions lib/AST/ASTWalker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
}

bool visitAbstractTypeParamDecl(AbstractTypeParamDecl *TPD) {
for (auto Inherit: TPD->getInherited()) {
if (doIt(Inherit))
return true;
}
return false;
}

Expand All @@ -207,10 +211,6 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
for (auto GP : NTD->getGenericParams()->getParams()) {
if (doIt(GP))
return true;
for(auto Inherit: GP->getInherited()) {
if (doIt(Inherit))
return true;
}
}
// Visit param conformance
for (auto &Req : NTD->getGenericParams()->getRequirements()) {
Expand Down Expand Up @@ -266,10 +266,6 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
for (auto &P : AFD->getGenericParams()->getParams()) {
if (doIt(P))
return true;
for (auto Inherit : P->getInherited()) {
if (doIt(Inherit))
return true;
}
}

// Visit param conformance
Expand Down
40 changes: 25 additions & 15 deletions test/Index/roles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,18 @@ struct AStruct {
}
}

class AClass {
class AClass { // used for references only
var y: AStruct;
var z: [Int]

init(x: Int) {
y = AStruct(x: x)
self.z = [1, 2, 3]
}

subscript(index: Int) -> Int {
get {
return z[0]
}
set {
z[0] = newValue
}
}

func foo() -> Int {
return z[0]
get { return z[0] }
set { z[0] = newValue }
}
func foo() -> Int { return z[0] }
}

let _ = AClass.foo
Expand All @@ -161,21 +152,38 @@ let _ = AClass(x: 1)[1] = 2
// CHECK: [[@LINE-1]]:21 | instance-property/subscript/Swift | subscript(_:) | s:14swift_ide_test6AClassC9subscriptSiSici | Ref,Writ | rel: 0
// CHECK: [[@LINE-2]]:21 | function/acc-set/Swift | setter:subscript(_:) | s:14swift_ide_test6AClassC9subscriptSiSicfs | Ref,Call,Dyn,Impl,RelRec | rel: 1

// RelationBaseOf, RelationOverrideOf

protocol X {}
// CHECK: [[@LINE-1]]:10 | protocol/Swift | X | [[X_USR:.*]] | Def | rel: 0

class ImplementsX : X {}
// CHECK: [[@LINE-1]]:7 | class/Swift | ImplementsX | [[ImplementsX_USR:.*]] | Def | rel: 0
// CHECK: [[@LINE-2]]:21 | protocol/Swift | X | [[X_USR]] | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | ImplementsX | [[ImplementsX_USR]]

protocol AProtocol {
// CHECK: [[@LINE-1]]:10 | protocol/Swift | AProtocol | [[AProtocol_USR:.*]] | Def | rel: 0

associatedtype T : X
// CHECK: [[@LINE-1]]:18 | type-alias/associated-type/Swift | T | s:14swift_ide_test9AProtocolP1T | Def,RelChild | rel: 1
// CHECK-NEXT: RelChild | AProtocol | [[AProtocol_USR]]
// CHECK: [[@LINE-3]]:22 | protocol/Swift | X | [[X_USR]] | Ref | rel: 0

func foo() -> Int
// CHECK: [[@LINE-1]]:8 | instance-method/Swift | foo() | s:14swift_ide_test9AProtocolP3fooSiyF | Def,RelChild | rel: 1
// CHECK-NEXT: RelChild | AProtocol | s:14swift_ide_test9AProtocolP
}

// RelationBaseOf, RelationOverrideOf
class ASubClass : AClass, AProtocol {
// CHECK: [[@LINE-1]]:7 | class/Swift | ASubClass | s:14swift_ide_test9ASubClassC | Def | rel: 0
// CHECK: [[@LINE-2]]:19 | class/Swift | AClass | s:14swift_ide_test6AClassC | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | ASubClass | s:14swift_ide_test9ASubClassC
// CHECK: [[@LINE-4]]:27 | protocol/Swift | AProtocol | s:14swift_ide_test9AProtocolP | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | ASubClass | s:14swift_ide_test9ASubClassC

typealias T = ImplementsX

override func foo() -> Int {
// CHECK: [[@LINE-1]]:17 | instance-method/Swift | foo() | s:14swift_ide_test9ASubClassC3fooSiyF | Def,RelChild,RelOver | rel: 3
// CHECK-NEXT: RelOver | foo() | s:14swift_ide_test6AClassC3fooSiyF
Expand Down Expand Up @@ -209,7 +217,9 @@ extension OuterS.InnerS : AProtocol {
// CHECK: [[@LINE-4]]:27 | protocol/Swift | AProtocol | [[AProtocol_USR]] | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | InnerS | [[EXT_INNERS_USR]]
// CHECK: [[@LINE-6]]:11 | struct/Swift | OuterS | [[OUTERS_USR]] | Ref | rel: 0
func foo() {}

typealias T = ImplementsX
func foo() -> Int { return 1 }
}

var anInstance = AClass(x: 1)
Expand Down