[SourceKit] Allow SourceEntityWalker to visit generic type parameters of type decls.

nkcsgexi · nkcsgexi · commit 264e91d3c486 · 2015-12-03T15:12:16.000-08:00
This unlocks SourceKit's "find related identifiers" request on generic type params. rdar://22356526
diff --git a/lib/AST/ASTWalker.cpp b/lib/AST/ASTWalker.cpp
@@ -193,6 +193,13 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
   }
 
   bool visitNominalTypeDecl(NominalTypeDecl *NTD) {
+    if(auto GPS = NTD->getGenericParams()) {
+      for (auto GP : GPS->getParams()) {
+        if (doIt(GP))
+          return true;
+      }
+    }
+
     for (auto &Inherit : NTD->getInherited()) {
       if (doIt(Inherit))
         return true;
diff --git a/test/IDE/annotation.swift b/test/IDE/annotation.swift
@@ -100,7 +100,7 @@ func bar(x: Int) -> (Int, Float) {
 class C2 {
   typealias WW = Int
   var p = 0
-  
+
   func meth(x: Int) {}
 }
 
@@ -109,7 +109,7 @@ func test2(x: C2) {
   x.meth(0)
 }
 
-// CHECK: class <Class>GenCls</Class><T> {
+// CHECK: class <Class>GenCls</Class><<GenericTypeParam>T</GenericTypeParam>> {
 class GenCls<T> {
   // CHECK: <Constructor>init</Constructor>() {}
   init() {}
diff --git a/test/SourceKit/SourceDocInfo/related_idents.swift b/test/SourceKit/SourceDocInfo/related_idents.swift
@@ -19,6 +19,10 @@ class C2 {
   }()
 }
 
+class C2<Param> {
+	func f(t : Param) -> Param {return t}
+}
+
 // RUN: %sourcekitd-test -req=related-idents -pos=6:17 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK1 %s
 // CHECK1: START RANGES
 // CHECK1-NEXT: 1:7 - 2
@@ -42,3 +46,10 @@ class C2 {
 // CHECK4-NEXT: 17:9 - 1
 // CHECK4-NEXT: 18:12 - 1
 // CHECK4-NEXT: END RANGES
+
+// RUN: %sourcekitd-test -req=related-idents -pos=22:12 %s -- -module-name related_idents %s | FileCheck -check-prefix=CHECK5 %s
+// CHECK5:      START RANGES
+// CHECK5-NEXT: 22:10 - 5
+// CHECK5-NEXT: 23:13 - 5
+// CHECK5-NEXT: 23:23 - 5
+// CHECK5-NEXT: END RANGES
