From 4035bf3006ca932234046de14928d7353f72ae55 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 5 Feb 2016 10:47:09 -0800 Subject: [PATCH] Allow parsing TS-style generics in JSDoc Fixes #6814 (cherry picked from commit 6e06bb39a13281c6080e973e1a015aea66e8b9ce) # Conflicts: # tests/cases/fourslash/jsDocGenerics1.ts --- src/compiler/parser.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 2840ef1aee6..041d34979ca 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -5765,16 +5765,22 @@ namespace ts { const result = 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); }