Modified createIdentifier to track originalKeywordKind

rbuckton · rbuckton · commit 7f51f7c81d34 · 2016-03-23T09:40:51.000-07:00
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -138,6 +138,7 @@ namespace ts {
     export function createIdentifier(text: string, location?: TextRange): Identifier {
         const node = <Identifier>createNode(SyntaxKind.Identifier, location);
         node.text = escapeIdentifier(text);
+        node.originalKeywordKind = stringToToken(text);
         return node;
     }
 
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -26,7 +26,7 @@ namespace ts {
         context.enableExpressionSubstitution(SyntaxKind.PrefixUnaryExpression);
         context.enableExpressionSubstitution(SyntaxKind.PostfixUnaryExpression);
         context.expressionSubstitution = substituteExpression;
-        
+
         context.enableEmitNotification(SyntaxKind.SourceFile);
 
         const exportFunctionForFileMap: Identifier[] = [];
@@ -125,7 +125,7 @@ namespace ts {
                 createStatement(
                     createCall(
                         createPropertyAccess(createIdentifier("System"), "register"),
-                        node.moduleName 
+                        node.moduleName
                             ? [createLiteral(node.moduleName), dependencies, body]
                             : [dependencies, body]
                     )
@@ -626,7 +626,7 @@ namespace ts {
                 if (!hasModifier(node, ModifierFlags.Default)) {
                     recordExportName(name);
                 }
-                
+
                 node = newNode;
             }
 
@@ -1073,7 +1073,7 @@ namespace ts {
         function substituteUnaryExpression(node: PrefixUnaryExpression | PostfixUnaryExpression): Expression {
             const operand = node.operand;
             const operator = node.operator;
-            const substitute = 
+            const substitute =
                 isIdentifier(operand) &&
                 (
                     node.kind === SyntaxKind.PostfixUnaryExpression ||
@@ -1090,7 +1090,7 @@ namespace ts {
                         return call;
                     }
                     else {
-                        return operator === SyntaxKind.PlusPlusToken 
+                        return operator === SyntaxKind.PlusPlusToken
                             ? createSubtract(call, createLiteral(1))
                             : createAdd(call, createLiteral(1))
                     }
@@ -1200,7 +1200,7 @@ namespace ts {
                             )
                         )
                     ],
-                    /*location*/ undefined, 
+                    /*location*/ undefined,
                     /*multiline*/ true)
                 )
             );
@@ -1243,7 +1243,6 @@ namespace ts {
             if (isImportClause(importDeclaration)) {
                 importAlias = getGeneratedNameForNode(importDeclaration.parent);
                 name = createIdentifier("default");
-                name.originalKeywordKind = SyntaxKind.DefaultKeyword;
             }
             else if (isImportSpecifier(importDeclaration)) {
                 importAlias = getGeneratedNameForNode(importDeclaration.parent.parent.parent);

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ namespace ts {`
`138`	`138`	`export function createIdentifier(text: string, location?: TextRange): Identifier {`
`139`	`139`	`const node = <Identifier>createNode(SyntaxKind.Identifier, location);`
`140`	`140`	`node.text = escapeIdentifier(text);`
	`141`	`+ node.originalKeywordKind = stringToToken(text);`
`141`	`142`	`return node;`
`142`	`143`	`}`
`143`	`144`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace ts {`
`26`	`26`	`context.enableExpressionSubstitution(SyntaxKind.PrefixUnaryExpression);`
`27`	`27`	`context.enableExpressionSubstitution(SyntaxKind.PostfixUnaryExpression);`
`28`	`28`	`context.expressionSubstitution = substituteExpression;`
`29`		`-`
	`29`	`+`
`30`	`30`	`context.enableEmitNotification(SyntaxKind.SourceFile);`
`31`	`31`
`32`	`32`	`const exportFunctionForFileMap: Identifier[] = [];`
`@@ -125,7 +125,7 @@ namespace ts {`
`125`	`125`	`createStatement(`
`126`	`126`	`createCall(`
`127`	`127`	`createPropertyAccess(createIdentifier("System"), "register"),`
`128`		`- node.moduleName`
	`128`	`+ node.moduleName`
`129`	`129`	`? [createLiteral(node.moduleName), dependencies, body]`
`130`	`130`	`: [dependencies, body]`
`131`	`131`	`)`
`@@ -626,7 +626,7 @@ namespace ts {`
`626`	`626`	`if (!hasModifier(node, ModifierFlags.Default)) {`
`627`	`627`	`recordExportName(name);`
`628`	`628`	`}`
`629`		`-`
	`629`	`+`
`630`	`630`	`node = newNode;`
`631`	`631`	`}`
`632`	`632`
`@@ -1073,7 +1073,7 @@ namespace ts {`
`1073`	`1073`	`function substituteUnaryExpression(node: PrefixUnaryExpression \| PostfixUnaryExpression): Expression {`
`1074`	`1074`	`const operand = node.operand;`
`1075`	`1075`	`const operator = node.operator;`
`1076`		`- const substitute =`
	`1076`	`+ const substitute =`
`1077`	`1077`	`isIdentifier(operand) &&`
`1078`	`1078`	`(`
`1079`	`1079`	`node.kind === SyntaxKind.PostfixUnaryExpression \|\|`
`@@ -1090,7 +1090,7 @@ namespace ts {`
`1090`	`1090`	`return call;`
`1091`	`1091`	`}`
`1092`	`1092`	`else {`
`1093`		`- return operator === SyntaxKind.PlusPlusToken`
	`1093`	`+ return operator === SyntaxKind.PlusPlusToken`
`1094`	`1094`	`? createSubtract(call, createLiteral(1))`
`1095`	`1095`	`: createAdd(call, createLiteral(1))`
`1096`	`1096`	`}`
`@@ -1200,7 +1200,7 @@ namespace ts {`
`1200`	`1200`	`)`
`1201`	`1201`	`)`
`1202`	`1202`	`],`
`1203`		`- /location/ undefined,`
	`1203`	`+ /location/ undefined,`
`1204`	`1204`	`/multiline/ true)`
`1205`	`1205`	`)`
`1206`	`1206`	`);`
`@@ -1243,7 +1243,6 @@ namespace ts {`
`1243`	`1243`	`if (isImportClause(importDeclaration)) {`
`1244`	`1244`	`importAlias = getGeneratedNameForNode(importDeclaration.parent);`
`1245`	`1245`	`name = createIdentifier("default");`
`1246`		`- name.originalKeywordKind = SyntaxKind.DefaultKeyword;`
`1247`	`1246`	`}`
`1248`	`1247`	`else if (isImportSpecifier(importDeclaration)) {`
`1249`	`1248`	`importAlias = getGeneratedNameForNode(importDeclaration.parent.parent.parent);`