Merge pull request microsoft#8092 from Microsoft/transforms-unescape-destructured-identifiers

sandersn · sandersn · commit cefe39c56b80 · 2016-04-14T11:26:23.000-07:00
[Transforms] Add calls to unescapeIdentifier for destructured identifiers
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
@@ -370,16 +370,19 @@ namespace ts {
                 );
             }
             else if (isLiteralExpression(propertyName)) {
-                return createElementAccess(
-                    expression,
-                    getSynthesizedClone(propertyName)
-                );
+                const clone = getSynthesizedClone(propertyName);
+                clone.text = unescapeIdentifier(clone.text);
+                return createElementAccess(expression, clone);
             }
             else {
-                return createPropertyAccess(
-                    expression,
-                    isGeneratedIdentifier(propertyName) ? getSynthesizedClone(propertyName) : createIdentifier(propertyName.text)
-                );
+                if (isGeneratedIdentifier(propertyName)) {
+                    const clone = getSynthesizedClone(propertyName);
+                    clone.text = unescapeIdentifier(clone.text);
+                    return createPropertyAccess(expression, clone);
+                }
+                else {
+                    return createPropertyAccess(expression, createIdentifier(unescapeIdentifier(propertyName.text)));
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -370,16 +370,19 @@ namespace ts {`
`370`	`370`	`);`
`371`	`371`	`}`
`372`	`372`	`else if (isLiteralExpression(propertyName)) {`
`373`		`- return createElementAccess(`
`374`		`- expression,`
`375`		`- getSynthesizedClone(propertyName)`
`376`		`- );`
	`373`	`+ const clone = getSynthesizedClone(propertyName);`
	`374`	`+ clone.text = unescapeIdentifier(clone.text);`
	`375`	`+ return createElementAccess(expression, clone);`
`377`	`376`	`}`
`378`	`377`	`else {`
`379`		`- return createPropertyAccess(`
`380`		`- expression,`
`381`		`- isGeneratedIdentifier(propertyName) ? getSynthesizedClone(propertyName) : createIdentifier(propertyName.text)`
`382`		`- );`
	`378`	`+ if (isGeneratedIdentifier(propertyName)) {`
	`379`	`+ const clone = getSynthesizedClone(propertyName);`
	`380`	`+ clone.text = unescapeIdentifier(clone.text);`
	`381`	`+ return createPropertyAccess(expression, clone);`
	`382`	`+ }`
	`383`	`+ else {`
	`384`	`+ return createPropertyAccess(expression, createIdentifier(unescapeIdentifier(propertyName.text)));`
	`385`	`+ }`
`383`	`386`	`}`
`384`	`387`	`}`
`385`	`388`	`}`