Detect and prevent creation of bad Identifier (microsoft#21581)

Andy · web-flow · commit 14bd0a2d5678 · 2018-02-05T09:13:38.000-08:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -5899,7 +5899,7 @@ namespace ts {
 
     /** True if node is of a kind that may contain comment text. */
     export function isJSDocCommentContainingNode(node: Node): boolean {
-        return node.kind === SyntaxKind.JSDocComment || isJSDocTag(node);
+        return node.kind === SyntaxKind.JSDocComment || isJSDocTag(node) || isJSDocTypeLiteral(node);
     }
 
     // TODO: determine what this does before making it public.
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -114,12 +114,15 @@ namespace ts {
             return sourceFile.text.substring(this.getStart(sourceFile), this.getEnd());
         }
 
-        private addSyntheticNodes(nodes: Node[], pos: number, end: number): number {
+        private addSyntheticNodes(nodes: Push<Node>, pos: number, end: number): number {
             scanner.setTextPos(pos);
             while (pos < end) {
                 const token = scanner.scan();
                 const textPos = scanner.getTextPos();
                 if (textPos <= end) {
+                    if (token === SyntaxKind.Identifier) {
+                        Debug.fail(`Did not expect ${(ts as any).SyntaxKind[this.kind]} to have an Identifier in its trivia`);
+                    }
                     nodes.push(createNode(token, pos, textPos, this));
                 }
                 pos = textPos;
diff --git a/tests/cases/fourslash/findAllReferencesJsDocTypeLiteral.ts b/tests/cases/fourslash/findAllReferencesJsDocTypeLiteral.ts
@@ -14,9 +14,3 @@
 //// function f(o) { return o.nested.[|great|]; }
 
 verify.rangesReferenceEachOther();
-
-///**
-// * @param {object} [|o|] - very important!
-// * @param {string} o.x - a thing, its ok
-// */
-// function f([|o|]) { return [|o|].x; }

Original file line number	Diff line number	Diff line change
`@@ -5899,7 +5899,7 @@ namespace ts {`
`5899`	`5899`
`5900`	`5900`	`/** True if node is of a kind that may contain comment text. */`
`5901`	`5901`	`export function isJSDocCommentContainingNode(node: Node): boolean {`
`5902`		`- return node.kind === SyntaxKind.JSDocComment \|\| isJSDocTag(node);`
	`5902`	`+ return node.kind === SyntaxKind.JSDocComment \|\| isJSDocTag(node) \|\| isJSDocTypeLiteral(node);`
`5903`	`5903`	`}`
`5904`	`5904`
`5905`	`5905`	`// TODO: determine what this does before making it public.`