Handle non-preserved const enums in debug messages (#21945)

microsoft · Feb 15, 2018 · 1b6aa13 · 1b6aa13
1 parent 8518343
commit 1b6aa13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -2927,7 +2927,8 @@ namespace ts {
         }
 
         export function showSymbol(symbol: Symbol): string {
-            return `{ flags: ${showFlags(symbol.flags, (ts as any).SymbolFlags)}; declarations: ${map(symbol.declarations, showSyntaxKind)} }`;
+            const symbolFlags = (ts as any).SymbolFlags;
+            return `{ flags: ${symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags}; declarations: ${map(symbol.declarations, showSyntaxKind)} }`;
         }
 
         function showFlags(flags: number, flagsEnum: { [flag: number]: string }): string {
@@ -2942,7 +2943,8 @@ namespace ts {
         }
 
         export function showSyntaxKind(node: Node): string {
-            return (ts as any).SyntaxKind[node.kind];
+            const syntaxKind = (ts as any).SyntaxKind;
+            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
         }
     }
 

diff --git a/src/services/services.ts b/src/services/services.ts
@@ -121,7 +121,7 @@ namespace ts {
                 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`);
+                        Debug.fail(`Did not expect ${Debug.showSyntaxKind(this)} to have an Identifier in its trivia`);
                     }
                     nodes.push(createNode(token, pos, textPos, this));
                 }