Fix createTempVariable to always record the name in the currentScopeNames

JsonFreeman · JsonFreeman · commit 4bb0587dd44d · 2015-03-04T19:35:06.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1684,7 +1684,11 @@ module ts {
                 else {
                     name = generateUniqueName(baseName, n => isExistingName(location, n));
                 }
-
+                
+                return putNameInCurrentScopeNames(name);
+            }
+            
+            function putNameInCurrentScopeNames(name: string): string {
                 if (!currentScopeNames) {
                     currentScopeNames = {};
                 }
@@ -2099,6 +2103,11 @@ module ts {
                     name = "_" + (tempCount < 25 ? String.fromCharCode(tempCount + (tempCount < 8 ? 0 : 1) + CharacterCodes.a) : tempCount - 25);
                     tempCount++;
                 }
+                
+                // This is necessary so that a name generated via renameNonTopLevelLetAndConst will see the name
+                // we just generated.
+                putNameInCurrentScopeNames(name);
+                
                 var result = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
                 result.text = name;
                 return result;
diff --git a/tests/baselines/reference/ES5For-of10.js b/tests/baselines/reference/ES5For-of10.js
@@ -13,8 +13,8 @@ function foo() {
 }
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     foo().x = _a[_i];
-    for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {
-        foo().x = _a_1[_i_1];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        foo().x = _c[_b];
         var p = foo().x;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of15.js b/tests/baselines/reference/ES5For-of15.js
@@ -10,8 +10,8 @@ for (let v of []) {
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
-    for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {
-        var _v = _a_1[_i_1];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        var _v = _c[_b];
         var x = _v;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of16.js b/tests/baselines/reference/ES5For-of16.js
@@ -11,8 +11,8 @@ for (let v of []) {
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
-    for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {
-        var _v = _a_1[_i_1];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        var _v = _c[_b];
         var x = _v;
         _v++;
     }
diff --git a/tests/baselines/reference/ES5For-of17.js b/tests/baselines/reference/ES5For-of17.js
@@ -11,8 +11,8 @@ for (let v of []) {
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
-    for (var _i_1 = 0, _a_1 = [v]; _i_1 < _a_1.length; _i_1++) {
-        var _v = _a_1[_i_1];
+    for (var _b = 0, _c = [v]; _b < _c.length; _b++) {
+        var _v = _c[_b];
         var x = _v;
         _v++;
     }
diff --git a/tests/baselines/reference/ES5For-of18.js b/tests/baselines/reference/ES5For-of18.js
@@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
 }
-for (var _i = 0, _b = []; _i < _b.length; _i++) {
-    var _v = _b[_i];
+for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    var _v = _c[_b];
     _v;
 }
diff --git a/tests/baselines/reference/ES5For-of19.js b/tests/baselines/reference/ES5For-of19.js
@@ -14,8 +14,8 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     v;
     function foo() {
-        for (var _i = 0, _a = []; _i < _a.length; _i++) {
-            var _v = _a[_i];
+        for (var _b = 0, _c = []; _b < _c.length; _b++) {
+            var _v = _c[_b];
             _v;
         }
     }
diff --git a/tests/baselines/reference/ES5For-of20.js b/tests/baselines/reference/ES5For-of20.js
@@ -10,8 +10,8 @@ for (let v of []) {
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     var _v;
-    for (var _i_1 = 0, _a_1 = [v]; _i_1 < _a_1.length; _i_1++) {
-        var _v_1 = _a_1[_i_1];
+    for (var _b = 0, _c = [v]; _b < _c.length; _b++) {
+        var _v_1 = _c[_b];
         var _v_2;
     }
 }
diff --git a/tests/baselines/reference/ES5For-of21.js b/tests/baselines/reference/ES5For-of21.js
@@ -7,6 +7,6 @@ for (let v of []) {
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var v = _a[_i];
     for (var _b = 0, _c = []; _b < _c.length; _b++) {
-        var _i = _c[_b];
+        var _i_1 = _c[_b];
     }
 }
diff --git a/tests/baselines/reference/ES5For-of22.js b/tests/baselines/reference/ES5For-of22.js
@@ -0,0 +1,12 @@
+//// [ES5For-of22.ts]
+for (var x of [1, 2, 3]) {
+    let _a = 0;
+    console.log(x);
+}
+
+//// [ES5For-of22.js]
+for (var _i = 0, _a = [1, 2, 3]; _i < _a.length; _i++) {
+    var x = _a[_i];
+    var _a_1 = 0;
+    console.log(x);
+}
diff --git a/tests/baselines/reference/ES5For-of23.js b/tests/baselines/reference/ES5For-of23.js
@@ -0,0 +1,12 @@
+//// [ES5For-of23.ts]
+for (var x of [1, 2, 3]) {
+    var _a = 0;
+    console.log(x);
+}
+
+//// [ES5For-of23.js]
+for (var _i = 0, _b = [1, 2, 3]; _i < _b.length; _i++) {
+    var x = _b[_i];
+    var _a = 0;
+    console.log(x);
+}
diff --git a/tests/baselines/reference/ES5For-of6.js b/tests/baselines/reference/ES5For-of6.js
@@ -8,8 +8,8 @@ for (var w of []) {
 //// [ES5For-of6.js]
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var w = _a[_i];
-    for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {
-        var v = _a_1[_i_1];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        var v = _c[_b];
         var x = [w, v];
     }
 }
diff --git a/tests/baselines/reference/ES5For-of7.js b/tests/baselines/reference/ES5For-of7.js
@@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {
     var w = _a[_i];
     var x = w;
 }
-for (var _i = 0, _b = []; _i < _b.length; _i++) {
-    var v = _b[_i];
+for (var _b = 0, _c = []; _b < _c.length; _b++) {
+    var v = _c[_b];
     var x = [w, v];
 }
diff --git a/tests/baselines/reference/ES5For-of9.js b/tests/baselines/reference/ES5For-of9.js
@@ -14,8 +14,8 @@ function foo() {
 }
 for (var _i = 0, _a = []; _i < _a.length; _i++) {
     foo().x = _a[_i];
-    for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {
-        foo().x = _a_1[_i_1];
+    for (var _b = 0, _c = []; _b < _c.length; _b++) {
+        foo().x = _c[_b];
         var p = foo().x;
     }
 }
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
@@ -39,8 +39,8 @@ var Bugs;
         }
         var result = message.replace(/\{(\d+)\}/g, function (match) {
             var rest = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                rest[_i - 1] = arguments[_i];
+            for (var _a = 1; _a < arguments.length; _a++) {
+                rest[_a - 1] = arguments[_a];
             }
             var index = rest[0];
             return typeof args[index] !== 'undefined' ? args[index] : match;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of22.ts
@@ -0,0 +1,4 @@
+for (var x of [1, 2, 3]) {
+    let _a = 0;
+    console.log(x);
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of23.ts
@@ -0,0 +1,4 @@
+for (var x of [1, 2, 3]) {
+    var _a = 0;
+    console.log(x);
+}

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ function foo() {`
`13`	`13`	`}`
`14`	`14`	`for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`15`	`15`	`foo().x = _a[_i];`
`16`		`- for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {`
`17`		`- foo().x = _a_1[_i_1];`
	`16`	`+ for (var _b = 0, _c = []; _b < _c.length; _b++) {`
	`17`	`+ foo().x = _c[_b];`
`18`	`18`	`var p = foo().x;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ for (let v of []) {`
`10`	`10`	`for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`11`	`11`	`var v = _a[_i];`
`12`	`12`	`v;`
`13`		`- for (var _i_1 = 0, _a_1 = []; _i_1 < _a_1.length; _i_1++) {`
`14`		`- var _v = _a_1[_i_1];`
	`13`	`+ for (var _b = 0, _c = []; _b < _c.length; _b++) {`
	`14`	`+ var _v = _c[_b];`
`15`	`15`	`var x = _v;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`12`	`12`	`var v = _a[_i];`
`13`	`13`	`v;`
`14`	`14`	`}`
`15`		`-for (var _i = 0, _b = []; _i < _b.length; _i++) {`
`16`		`- var _v = _b[_i];`
	`15`	`+for (var _b = 0, _c = []; _b < _c.length; _b++) {`
	`16`	`+ var _v = _c[_b];`
`17`	`17`	`_v;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`14`	`14`	`var v = _a[_i];`
`15`	`15`	`v;`
`16`	`16`	`function foo() {`
`17`		`- for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`18`		`- var _v = _a[_i];`
	`17`	`+ for (var _b = 0, _c = []; _b < _c.length; _b++) {`
	`18`	`+ var _v = _c[_b];`
`19`	`19`	`_v;`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ for (let v of []) {`
`7`	`7`	`for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`8`	`8`	`var v = _a[_i];`
`9`	`9`	`for (var _b = 0, _c = []; _b < _c.length; _b++) {`
`10`		`- var _i = _c[_b];`
	`10`	`+ var _i_1 = _c[_b];`
`11`	`11`	`}`
`12`	`12`	`}`