Merge pull request microsoft#12808 from Microsoft/self-referencing-spread-recursive-loop

sandersn · web-flow · commit 65bb78d569e8 · 2016-12-12T10:40:34.000-08:00
Self-referencing spread recursive loop
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11320,13 +11320,7 @@ namespace ts {
         }
 
         function checkSpreadExpression(node: SpreadElement, contextualMapper?: TypeMapper): Type {
-            // It is usually not safe to call checkExpressionCached if we can be contextually typing.
-            // You can tell that we are contextually typing because of the contextualMapper parameter.
-            // While it is true that a spread element can have a contextual type, it does not do anything
-            // with this type. It is neither affected by it, nor does it propagate it to its operand.
-            // So the fact that contextualMapper is passed is not important, because the operand of a spread
-            // element is not contextually typed.
-            const arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
+            const arrayOrIterableType = checkExpression(node.expression, contextualMapper);
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
         }
 
diff --git a/tests/baselines/reference/selfReferencingSpreadInLoop.errors.txt b/tests/baselines/reference/selfReferencingSpreadInLoop.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/compiler/selfReferencingSpreadInLoop.ts(1,5): error TS7034: Variable 'additional' implicitly has type 'any[]' in some locations where its type cannot be determined.
+tests/cases/compiler/selfReferencingSpreadInLoop.ts(3,22): error TS7005: Variable 'additional' implicitly has an 'any[]' type.
+
+
+==== tests/cases/compiler/selfReferencingSpreadInLoop.ts (2 errors) ====
+    let additional = [];
+        ~~~~~~~~~~
+!!! error TS7034: Variable 'additional' implicitly has type 'any[]' in some locations where its type cannot be determined.
+    for (const subcomponent of [1, 2, 3]) {
+        additional = [...additional, subcomponent];
+                         ~~~~~~~~~~
+!!! error TS7005: Variable 'additional' implicitly has an 'any[]' type.
+    }
+    
diff --git a/tests/baselines/reference/selfReferencingSpreadInLoop.js b/tests/baselines/reference/selfReferencingSpreadInLoop.js
@@ -0,0 +1,13 @@
+//// [selfReferencingSpreadInLoop.ts]
+let additional = [];
+for (const subcomponent of [1, 2, 3]) {
+    additional = [...additional, subcomponent];
+}
+
+
+//// [selfReferencingSpreadInLoop.js]
+var additional = [];
+for (var _i = 0, _a = [1, 2, 3]; _i < _a.length; _i++) {
+    var subcomponent = _a[_i];
+    additional = additional.concat([subcomponent]);
+}
diff --git a/tests/cases/compiler/selfReferencingSpreadInLoop.ts b/tests/cases/compiler/selfReferencingSpreadInLoop.ts
@@ -0,0 +1,5 @@
+// @noImplicitAny: true
+let additional = [];
+for (const subcomponent of [1, 2, 3]) {
+    additional = [...additional, subcomponent];
+}

Original file line number	Diff line number	Diff line change
`@@ -11320,13 +11320,7 @@ namespace ts {`
`11320`	`11320`	`}`
`11321`	`11321`
`11322`	`11322`	`function checkSpreadExpression(node: SpreadElement, contextualMapper?: TypeMapper): Type {`
`11323`		`- // It is usually not safe to call checkExpressionCached if we can be contextually typing.`
`11324`		`- // You can tell that we are contextually typing because of the contextualMapper parameter.`
`11325`		`- // While it is true that a spread element can have a contextual type, it does not do anything`
`11326`		`- // with this type. It is neither affected by it, nor does it propagate it to its operand.`
`11327`		`- // So the fact that contextualMapper is passed is not important, because the operand of a spread`
`11328`		`- // element is not contextually typed.`
`11329`		`- const arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);`
	`11323`	`+ const arrayOrIterableType = checkExpression(node.expression, contextualMapper);`
`11330`	`11324`	`return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /allowStringInput/ false);`
`11331`	`11325`	`}`
`11332`	`11326`