handle cases when body of for-of statement is expanded after loop conversion (microsoft#13677)

vladima · web-flow · commit abc30b26c752 · 2017-01-25T09:53:34.000-08:00
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
@@ -2316,7 +2316,7 @@ namespace ts {
                 addRange(statements, convertedLoopBodyStatements);
             }
             else {
-                const statement = visitNode(node.statement, visitor, isStatement);
+                const statement = visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock);
                 if (isBlock(statement)) {
                     addRange(statements, statement.statements);
                     bodyLocation = statement;
diff --git a/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.js b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.js
@@ -0,0 +1,18 @@
+//// [nestedLoopWithOnlyInnerLetCaptured.ts]
+declare let doSomething;
+
+for (let a1 of [])
+    for (let a2 of a1.someArray)
+        doSomething(() => a2);
+
+//// [nestedLoopWithOnlyInnerLetCaptured.js]
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    var a1 = _a[_i];
+    var _loop_1 = function (a2) {
+        doSomething(function () { return a2; });
+    };
+    for (var _b = 0, _c = a1.someArray; _b < _c.length; _b++) {
+        var a2 = _c[_b];
+        _loop_1(a2);
+    }
+}
diff --git a/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.symbols b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts ===
+declare let doSomething;
+>doSomething : Symbol(doSomething, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 0, 11))
+
+for (let a1 of [])
+>a1 : Symbol(a1, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 2, 8))
+
+    for (let a2 of a1.someArray)
+>a2 : Symbol(a2, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 3, 12))
+>a1 : Symbol(a1, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 2, 8))
+
+        doSomething(() => a2);
+>doSomething : Symbol(doSomething, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 0, 11))
+>a2 : Symbol(a2, Decl(nestedLoopWithOnlyInnerLetCaptured.ts, 3, 12))
+
diff --git a/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.types b/tests/baselines/reference/nestedLoopWithOnlyInnerLetCaptured.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts ===
+declare let doSomething;
+>doSomething : any
+
+for (let a1 of [])
+>a1 : any
+>[] : undefined[]
+
+    for (let a2 of a1.someArray)
+>a2 : any
+>a1.someArray : any
+>a1 : any
+>someArray : any
+
+        doSomething(() => a2);
+>doSomething(() => a2) : any
+>doSomething : any
+>() => a2 : () => any
+>a2 : any
+
diff --git a/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts b/tests/cases/compiler/nestedLoopWithOnlyInnerLetCaptured.ts
@@ -0,0 +1,6 @@
+// @target: es5
+declare let doSomething;
+
+for (let a1 of [])
+    for (let a2 of a1.someArray)
+        doSomething(() => a2);

Original file line number	Diff line number	Diff line change
`@@ -2316,7 +2316,7 @@ namespace ts {`
`2316`	`2316`	`addRange(statements, convertedLoopBodyStatements);`
`2317`	`2317`	`}`
`2318`	`2318`	`else {`
`2319`		`- const statement = visitNode(node.statement, visitor, isStatement);`
	`2319`	`+ const statement = visitNode(node.statement, visitor, isStatement, /optional/ false, liftToBlock);`
`2320`	`2320`	`if (isBlock(statement)) {`
`2321`	`2321`	`addRange(statements, statement.statements);`
`2322`	`2322`	`bodyLocation = statement;`