Fix missing tokenToString for the backtick

sheetalkamat · sheetalkamat · commit 607c9c5e2681 · 2019-07-16T13:30:38.000-07:00
Fixes microsoft#32073
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -197,6 +197,7 @@ namespace ts {
         "|=": SyntaxKind.BarEqualsToken,
         "^=": SyntaxKind.CaretEqualsToken,
         "@": SyntaxKind.AtToken,
+        "`": SyntaxKind.BacktickToken
     });
 
     /*
@@ -298,7 +299,6 @@ namespace ts {
     }
 
     const tokenStrings = makeReverseMap(textToToken);
-
     export function tokenToString(t: SyntaxKind): string | undefined {
         return tokenStrings[t];
     }
diff --git a/src/testRunner/unittests/publicApi.ts b/src/testRunner/unittests/publicApi.ts
@@ -31,3 +31,18 @@ describe("Public APIs", () => {
         verifyApi("tsserverlibrary.d.ts");
     });
 });
+
+describe("Public APIs:: token to string", () => {
+    function assertDefinedTokenToString(initial: ts.SyntaxKind, last: ts.SyntaxKind) {
+        for (let t = initial; t <= last; t++) {
+            assert.isDefined(ts.tokenToString(t), `Expected tokenToString defined for ${ts.Debug.formatSyntaxKind(t)}`);
+        }
+    }
+
+    it("for punctuations", () => {
+        assertDefinedTokenToString(ts.SyntaxKind.FirstPunctuation, ts.SyntaxKind.LastPunctuation);
+    });
+    it("for keywords", () => {
+        assertDefinedTokenToString(ts.SyntaxKind.FirstKeyword, ts.SyntaxKind.LastKeyword);
+    });
+});
diff --git a/tests/baselines/reference/jsdocParameterParsingInvalidName.js b/tests/baselines/reference/jsdocParameterParsingInvalidName.js
@@ -0,0 +1,20 @@
+//// [jsdocParameterParsingInvalidName.ts]
+class c {
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+    }
+}
+
+//// [jsdocParameterParsingInvalidName.js]
+var c = /** @class */ (function () {
+    function c() {
+    }
+    /**
+     * @param {string} [`foo]
+     */
+    c.prototype.method = function (foo) {
+    };
+    return c;
+}());
diff --git a/tests/baselines/reference/jsdocParameterParsingInvalidName.symbols b/tests/baselines/reference/jsdocParameterParsingInvalidName.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/jsdocParameterParsingInvalidName.ts ===
+class c {
+>c : Symbol(c, Decl(jsdocParameterParsingInvalidName.ts, 0, 0))
+
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+>method : Symbol(c.method, Decl(jsdocParameterParsingInvalidName.ts, 0, 9))
+>foo : Symbol(foo, Decl(jsdocParameterParsingInvalidName.ts, 4, 11))
+    }
+}
diff --git a/tests/baselines/reference/jsdocParameterParsingInvalidName.types b/tests/baselines/reference/jsdocParameterParsingInvalidName.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/jsdocParameterParsingInvalidName.ts ===
+class c {
+>c : c
+
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+>method : (foo: any) => void
+>foo : any
+    }
+}
diff --git a/tests/cases/compiler/jsdocParameterParsingInvalidName.ts b/tests/cases/compiler/jsdocParameterParsingInvalidName.ts
@@ -0,0 +1,7 @@
+class c {
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ namespace ts {`
`197`	`197`	`"\|=": SyntaxKind.BarEqualsToken,`
`198`	`198`	`"^=": SyntaxKind.CaretEqualsToken,`
`199`	`199`	`"@": SyntaxKind.AtToken,`
	`200`	+ "`": SyntaxKind.BacktickToken
`200`	`201`	`});`
`201`	`202`
`202`	`203`	`/*`
`@@ -298,7 +299,6 @@ namespace ts {`
`298`	`299`	`}`
`299`	`300`
`300`	`301`	`const tokenStrings = makeReverseMap(textToToken);`
`301`		`-`
`302`	`302`	`export function tokenToString(t: SyntaxKind): string \| undefined {`
`303`	`303`	`return tokenStrings[t];`
`304`	`304`	`}`