[SourceKit] Update terminology in generic parameter tag names

And add a test that does cursor info on the generic parameter itself,
not just on the parent decl context.

rdar://problem/24292226

Author: benlangmuir

test/SourceKit/DocSupport/doc_source_file.swift.response

@@ -2574,7 +2574,7 @@
     ],
     key.offset: 1868,
     key.length: 53,
-    key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>genfoo</decl.name>&lt;<decl.generic_type_param usr=\"s:tF8__main__6genfoouRxS_5Prot2wx7ElementzSirFxT_L_1TMx\"><decl.name>T</decl.name> : <decl.generic_type_param.type><ref.protocol usr=\"s:P8__main__5Prot2\">Prot2</ref.protocol></decl.generic_type_param.type></decl.generic_type_param> <syntaxtype.keyword>where</syntaxtype.keyword> <decl.function.returntype><ref.generic_type_param usr=\"s:tF8__main__6genfoouRxS_5Prot2wx7ElementzSirFxT_L_1TMx\">T</ref.generic_type_param>.<ref.associatedtype usr=\"s:P8__main__5Prot27Element\">Element</ref.associatedtype></decl.function.returntype> == <decl.function.returntype><ref.struct usr=\"s:Si\">Int</ref.struct></decl.function.returntype>&gt;(<decl.var.parameter><decl.var.parameter.name>x</decl.var.parameter.name>: <decl.var.parameter.type><ref.generic_type_param usr=\"s:tF8__main__6genfoouRxS_5Prot2wx7ElementzSirFxT_L_1TMx\">T</ref.generic_type_param></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
+    key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>genfoo</decl.name>&lt;<decl.generic_type_param usr=\"s:tF8__main__6genfoouRxS_5Prot2wx7ElementzSirFxT_L_1TMx\"><decl.generic_type_param.name>T</decl.generic_type_param.name> : <decl.generic_type_param.constraint><ref.protocol usr=\"s:P8__main__5Prot2\">Prot2</ref.protocol></decl.generic_type_param.constraint></decl.generic_type_param> <syntaxtype.keyword>where</syntaxtype.keyword> <decl.function.returntype><ref.generic_type_param usr=\"s:tF8__main__6genfoouRxS_5Prot2wx7ElementzSirFxT_L_1TMx\">T</ref.generic_type_param>.<ref.associatedtype usr=\"s:P8__main__5Prot27Element\">Element</ref.associatedtype></decl.function.returntype> == <decl.function.returntype><ref.struct usr=\"s:Si\">Int</ref.struct></decl.function.returntype>&gt;(<decl.var.parameter><decl.var.parameter.name>x</decl.var.parameter.name>: <decl.var.parameter.type><ref.generic_type_param usr=\"s:tF8__main__6genfoouRxS_5Prot2wx7ElementzSirFxT_L_1TMx\">T</ref.generic_type_param></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
     key.entities: [
       {
         key.kind: source.lang.swift.decl.var.local,

test/SourceKit/DocSupport/doc_swift_module.swift.response

@@ -662,7 +662,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ],
     key.offset: 381,
     key.length: 106,
-    key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>genfoo</decl.name>&lt;<decl.generic_type_param usr=\"s:tF4cake6genfoou0_RxS_4Prot_CS_2C1wx7ElementzSirFT1xx1yq__T_L_2T1Mx\"><decl.name>T1</decl.name> : <decl.generic_type_param.type><ref.protocol usr=\"s:P4cake4Prot\">Prot</ref.protocol></decl.generic_type_param.type></decl.generic_type_param>, <decl.generic_type_param usr=\"s:tF4cake6genfoou0_RxS_4Prot_CS_2C1wx7ElementzSirFT1xx1yq__T_L_2T2Mq_\"><decl.name>T2</decl.name> : <decl.generic_type_param.type><ref.class usr=\"s:C4cake2C1\">C1</ref.class></decl.generic_type_param.type></decl.generic_type_param> <syntaxtype.keyword>where</syntaxtype.keyword> T1.Element == Int, T2.Element == T1.Element&gt;(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label> <decl.var.parameter.name>ix</decl.var.parameter.name>: <decl.var.parameter.type>T1</decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>y</decl.var.parameter.argument_label> <decl.var.parameter.name>iy</decl.var.parameter.name>: <decl.var.parameter.type>T2</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
+    key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>genfoo</decl.name>&lt;<decl.generic_type_param usr=\"s:tF4cake6genfoou0_RxS_4Prot_CS_2C1wx7ElementzSirFT1xx1yq__T_L_2T1Mx\"><decl.generic_type_param.name>T1</decl.generic_type_param.name> : <decl.generic_type_param.constraint><ref.protocol usr=\"s:P4cake4Prot\">Prot</ref.protocol></decl.generic_type_param.constraint></decl.generic_type_param>, <decl.generic_type_param usr=\"s:tF4cake6genfoou0_RxS_4Prot_CS_2C1wx7ElementzSirFT1xx1yq__T_L_2T2Mq_\"><decl.generic_type_param.name>T2</decl.generic_type_param.name> : <decl.generic_type_param.constraint><ref.class usr=\"s:C4cake2C1\">C1</ref.class></decl.generic_type_param.constraint></decl.generic_type_param> <syntaxtype.keyword>where</syntaxtype.keyword> T1.Element == Int, T2.Element == T1.Element&gt;(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label> <decl.var.parameter.name>ix</decl.var.parameter.name>: <decl.var.parameter.type>T1</decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.argument_label>y</decl.var.parameter.argument_label> <decl.var.parameter.name>iy</decl.var.parameter.name>: <decl.var.parameter.type>T2</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
     key.entities: [
       {
         key.kind: source.lang.swift.decl.var.local,

test/SourceKit/SourceDocInfo/cursor_info.swift

@@ -311,31 +311,31 @@ func refEnumElements() {
 // CHECK33-NEXT: s:V11cursor_info2S2
 // CHECK33-NEXT: S2.Type
 // CHECK33-NEXT: <Declaration>struct S2&lt;T, U&gt;</Declaration>
-// CHECK33-NEXT: <decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>S2</decl.name>&lt;<decl.generic_type_param usr="s:tV11cursor_info2S21TMx"><decl.name>T</decl.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.name>U</decl.name></decl.generic_type_param>&gt;</decl.struct>
+// CHECK33-NEXT: <decl.struct><syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>S2</decl.name>&lt;<decl.generic_type_param usr="s:tV11cursor_info2S21TMx"><decl.generic_type_param.name>T</decl.generic_type_param.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>U</decl.generic_type_param.name></decl.generic_type_param>&gt;</decl.struct>
 
 // RUN: %sourcekitd-test -req=cursor -pos=81:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK34
 // CHECK34: source.lang.swift.decl.function.method.instance (81:8-81:48)
 // CHECK34-NEXT: foo(_:)
 // CHECK34-NEXT: s:FV11cursor_info2S23foou0_rFFT_T_FT_T_
 // CHECK34-NEXT: <T, U> (S2<T, U>) -> <V, W> (() -> ()) -> () -> ()
 // CHECK34-NEXT: <Declaration>func foo&lt;V, W&gt;(closure: () -&gt; ()) -&gt; () -&gt; ()</Declaration>
-// CHECK34-NEXT: <decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>foo</decl.name>&lt;<decl.generic_type_param usr="{{.*}}"><decl.name>V</decl.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.name>W</decl.name></decl.generic_type_param>&gt;(<decl.var.parameter><decl.var.parameter.name>closure</decl.var.parameter.name>: <decl.var.parameter.type>() -&gt; ()</decl.var.parameter.type></decl.var.parameter>) -&gt; <decl.function.returntype>() -&gt; ()</decl.function.returntype></decl.function.method.instance>
+// CHECK34-NEXT: <decl.function.method.instance><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>foo</decl.name>&lt;<decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>V</decl.generic_type_param.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>W</decl.generic_type_param.name></decl.generic_type_param>&gt;(<decl.var.parameter><decl.var.parameter.name>closure</decl.var.parameter.name>: <decl.var.parameter.type>() -&gt; ()</decl.var.parameter.type></decl.var.parameter>) -&gt; <decl.function.returntype>() -&gt; ()</decl.function.returntype></decl.function.method.instance>
 
 // RUN: %sourcekitd-test -req=cursor -pos=83:7 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK35
 // CHECK35: source.lang.swift.decl.class (83:7-83:9)
 // CHECK35-NEXT: C4
 // CHECK35-NEXT: s:C11cursor_info2C4
 // CHECK35-NEXT: C4.Type
 // CHECK35-NEXT: <Declaration>class C4&lt;T, U&gt;</Declaration>
-// CHECK35-NEXT: <decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>C4</decl.name>&lt;<decl.generic_type_param usr="{{.*}}"><decl.name>T</decl.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.name>U</decl.name></decl.generic_type_param>&gt;</decl.class>
+// CHECK35-NEXT: <decl.class><syntaxtype.keyword>class</syntaxtype.keyword> <decl.name>C4</decl.name>&lt;<decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>T</decl.generic_type_param.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>U</decl.generic_type_param.name></decl.generic_type_param>&gt;</decl.class>
 
 // RUN: %sourcekitd-test -req=cursor -pos=84:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK36
 // CHECK36: source.lang.swift.decl.enum (84:6-84:8)
 // CHECK36-NEXT: E1
 // CHECK36-NEXT: s:O11cursor_info2E1
 // CHECK36-NEXT: E1.Type
 // CHECK36-NEXT: <Declaration>enum E1&lt;T, U&gt;</Declaration>
-// CHECK36-NEXT: <decl.enum><syntaxtype.keyword>enum</syntaxtype.keyword> <decl.name>E1</decl.name>&lt;<decl.generic_type_param usr="{{.*}}"><decl.name>T</decl.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.name>U</decl.name></decl.generic_type_param>&gt;</decl.enum>
+// CHECK36-NEXT: <decl.enum><syntaxtype.keyword>enum</syntaxtype.keyword> <decl.name>E1</decl.name>&lt;<decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>T</decl.generic_type_param.name></decl.generic_type_param>, <decl.generic_type_param usr="{{.*}}"><decl.generic_type_param.name>U</decl.generic_type_param.name></decl.generic_type_param>&gt;</decl.enum>
 
 // RUN: %sourcekitd-test -req=cursor -pos=86:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK37
 // CHECK37: source.lang.swift.decl.function.free (86:6-86:111)
@@ -407,3 +407,11 @@ func refEnumElements() {
 // CHECK46-NEXT: C
 // CHECK46: <Declaration>case C</Declaration>
 // CHECK46-NEXT: <decl.enumelement><syntaxtype.keyword>case</syntaxtype.keyword> <decl.name>C</decl.name></decl.enumelement>
+
+// RUN: %sourcekitd-test -req=cursor -pos=80:11 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | FileCheck %s -check-prefix=CHECK47
+// CHECK47: source.lang.swift.decl.generic_type_param (80:11-80:12)
+// CHECK47-NEXT: T
+// CHECK47-NEXT: s:tV11cursor_info2S21TMx
+// CHECK47-NEXT: T.Type
+// CHECK47-NEXT: <Declaration>T</Declaration>
+// CHECK47-NEXT: <decl.generic_type_param><decl.generic_type_param.name>T</decl.generic_type_param.name></decl.generic_type_param>

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp

@@ -67,6 +67,7 @@ static StringRef getTagForDecl(const Decl *D, bool isRef) {
 
 static StringRef ExternalParamNameTag = "decl.var.parameter.argument_label";
 static StringRef LocalParamNameTag = "decl.var.parameter.name";
+static StringRef GenericParamNameTag = "decl.generic_type_param.name";
 static StringRef SyntaxKeywordTag = "syntaxtype.keyword";
 
 static StringRef getTagForParameter(PrintParameterKind context) {
@@ -85,6 +86,8 @@ static StringRef getDeclNameTagForDecl(const Decl *D) {
     // When we're examining the parameter itself, it is the local name that is
     // the name of the variable.
     return LocalParamNameTag;
+  case DeclKind::GenericTypeParam:
+    return ""; // Handled by printName.
   case DeclKind::Constructor:
   case DeclKind::Destructor:
   case DeclKind::Subscript:
@@ -169,10 +172,14 @@ class FullyAnnotatedDeclarationPrinter final : public XMLEscapingPrinter {
   }
 
   void printDeclLoc(const Decl *D) override {
-    openTag(getDeclNameTagForDecl(D));
+    auto tag = getDeclNameTagForDecl(D);
+    if (!tag.empty())
+      openTag(tag);
   }
   void printDeclNameEndLoc(const Decl *D) override {
-    closeTag(getDeclNameTagForDecl(D));
+    auto tag = getDeclNameTagForDecl(D);
+    if (!tag.empty())
+      closeTag(tag);
   }
 
   void printTypePre(const TypeLoc &TL) override {
@@ -241,7 +248,7 @@ class FullyAnnotatedDeclarationPrinter final : public XMLEscapingPrinter {
       return "";
 
     static StringRef parameterTypeTag = "decl.var.parameter.type";
-    static StringRef genericParamTypeTag = "decl.generic_type_param.type";
+    static StringRef genericParamTypeTag = "decl.generic_type_param.constraint";
 
     auto context = contextStack.back();
     if (context.is(PrintParameterKind::FunctionParameter))
@@ -277,7 +284,7 @@ class FullyAnnotatedDeclarationPrinter final : public XMLEscapingPrinter {
     case PrintNameContext::Keyword:
       return SyntaxKeywordTag;
     case PrintNameContext::GenericParameter:
-      return "decl.name"; // FIXME: should this be more specific?
+      return GenericParamNameTag;
     default:
       return "";
     }