Support parsing @template {T} in addition to @template T (microsoft#21270)

Andy · web-flow · commit 466557cafb56 · 2018-01-18T09:45:29.000-08:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -6830,7 +6830,7 @@ namespace ts {
                 }
 
                 function parseTemplateTag(atToken: AtToken, tagName: Identifier): JSDocTemplateTag | undefined {
-                    if (forEach(tags, t => t.kind === SyntaxKind.JSDocTemplateTag)) {
+                    if (some(tags, isJSDocTemplateTag)) {
                         parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
 
@@ -6839,14 +6839,14 @@ namespace ts {
                     const typeParametersPos = getNodePos();
 
                     while (true) {
-                        const name = parseJSDocIdentifierName();
+                        const typeParameter = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
+                        const name = parseJSDocIdentifierNameWithOptionalBraces();
                         skipWhitespace();
                         if (!name) {
                             parseErrorAtPosition(scanner.getStartPos(), 0, Diagnostics.Identifier_expected);
                             return undefined;
                         }
 
-                        const typeParameter = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter, name.pos);
                         typeParameter.name = name;
                         finishNode(typeParameter);
 
@@ -6869,6 +6869,15 @@ namespace ts {
                     return result;
                 }
 
+                function parseJSDocIdentifierNameWithOptionalBraces(): Identifier | undefined {
+                    const parsedBrace = parseOptional(SyntaxKind.OpenBraceToken);
+                    const res = parseJSDocIdentifierName();
+                    if (parsedBrace) {
+                        parseExpected(SyntaxKind.CloseBraceToken);
+                    }
+                    return res;
+                }
+
                 function nextJSDocToken(): JsDocSyntaxKind {
                     return currentToken = scanner.scanJSDocToken();
                 }
diff --git a/tests/baselines/reference/quickInfoJsDocTags.baseline b/tests/baselines/reference/quickInfoJsDocTags.baseline
@@ -63,7 +63,7 @@
       ],
       "documentation": [
         {
-          "text": "DocT} A template",
+          "text": "Doc",
           "kind": "text"
         }
       ],
@@ -76,6 +76,10 @@
           "name": "augments",
           "text": "C<T> Augments it"
         },
+        {
+          "name": "template",
+          "text": "{T} A template"
+        },
         {
           "name": "type",
           "text": "{number | string} A type"

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`],`
`64`	`64`	`"documentation": [`
`65`	`65`	`{`
`66`		`- "text": "DocT} A template",`
	`66`	`+ "text": "Doc",`
`67`	`67`	`"kind": "text"`
`68`	`68`	`}`
`69`	`69`	`],`
`@@ -76,6 +76,10 @@`
`76`	`76`	`"name": "augments",`
`77`	`77`	`"text": "C<T> Augments it"`
`78`	`78`	`},`
	`79`	`+ {`
	`80`	`+ "name": "template",`
	`81`	`+ "text": "{T} A template"`
	`82`	`+ },`
`79`	`83`	`{`
`80`	`84`	`"name": "type",`
`81`	`85`	`"text": "{number \| string} A type"`