Allow parsing TS-style generics in JSDoc

Fixes microsoft#6814
RyanCavanaugh · Feb 2, 2016 · 6e06bb3 · 6e06bb3
1 parent 554ea1b
commit 6e06bb3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -5734,16 +5734,22 @@ namespace ts {
                 const result = <JSDocTypeReference>createNode(SyntaxKind.JSDocTypeReference);
                 result.name = parseSimplePropertyName();
 
-                while (parseOptional(SyntaxKind.DotToken)) {
-                    if (token === SyntaxKind.LessThanToken) {
-                        result.typeArguments = parseTypeArguments();
-                        break;
-                    }
-                    else {
-                        result.name = parseQualifiedName(result.name);
+                if (token === SyntaxKind.LessThanToken) {
+                    result.typeArguments = parseTypeArguments();
+                }
+                else {
+                    while (parseOptional(SyntaxKind.DotToken)) {
+                        if (token === SyntaxKind.LessThanToken) {
+                            result.typeArguments = parseTypeArguments();
+                            break;
+                        }
+                        else {
+                            result.name = parseQualifiedName(result.name);
+                        }
                     }
                 }
 
+
                 return finishNode(result);
             }
 

diff --git a/tests/cases/fourslash/jsDocGenerics1.ts b/tests/cases/fourslash/jsDocGenerics1.ts
@@ -0,0 +1,10 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: Foo.js
+//// /** @type {Array<number>} */
+//// var v;
+//// v[0]./**/
+
+goTo.marker();
+verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");