Optimize direct Iterable reference in getIteratedType

JsonFreeman · JsonFreeman · commit 197a42a692d8 · 2015-03-25T18:38:14.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -9346,6 +9346,12 @@ module ts {
                     return undefined;
                 }
 
+                // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
+                // then just grab its type argument.
+                if ((iterable.flags & TypeFlags.Reference) && (<GenericType>iterable).target === globalIterableType) {
+                    return (<GenericType>iterable).typeArguments[0];
+                }
+
                 let iteratorFunction = getTypeOfPropertyOfType(iterable, getPropertyNameForKnownSymbolName("iterator"));
                 if (iteratorFunction && allConstituentTypesHaveKind(iteratorFunction, TypeFlags.Any)) {
                     return undefined;
diff --git a/tests/baselines/reference/for-of57.js b/tests/baselines/reference/for-of57.js
@@ -0,0 +1,8 @@
+//// [for-of57.ts]
+var iter: Iterable<number>;
+for (let num of iter) { }
+
+//// [for-of57.js]
+var iter;
+for (let num of iter) {
+}
diff --git a/tests/baselines/reference/for-of57.types b/tests/baselines/reference/for-of57.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/for-ofStatements/for-of57.ts ===
+var iter: Iterable<number>;
+>iter : Iterable<number>
+>Iterable : Iterable<T>
+
+for (let num of iter) { }
+>num : number
+>iter : Iterable<number>
+
diff --git a/tests/baselines/reference/iteratorSpreadInArray11.js b/tests/baselines/reference/iteratorSpreadInArray11.js
@@ -0,0 +1,9 @@
+//// [iteratorSpreadInArray11.ts]
+var iter: Iterable<number>;
+var array = [...iter];
+
+//// [iteratorSpreadInArray11.js]
+var iter;
+var array = [
+    ...iter
+];
diff --git a/tests/baselines/reference/iteratorSpreadInArray11.types b/tests/baselines/reference/iteratorSpreadInArray11.types
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/es6/spread/iteratorSpreadInArray11.ts ===
+var iter: Iterable<number>;
+>iter : Iterable<number>
+>Iterable : Iterable<T>
+
+var array = [...iter];
+>array : number[]
+>[...iter] : number[]
+>...iter : number
+>iter : Iterable<number>
+
diff --git a/tests/cases/conformance/es6/for-ofStatements/for-of57.ts b/tests/cases/conformance/es6/for-ofStatements/for-of57.ts
@@ -0,0 +1,3 @@
+//@target: ES6
+var iter: Iterable<number>;
+for (let num of iter) { }
diff --git a/tests/cases/conformance/es6/spread/iteratorSpreadInArray11.ts b/tests/cases/conformance/es6/spread/iteratorSpreadInArray11.ts
@@ -0,0 +1,3 @@
+//@target: ES6
+var iter: Iterable<number>;
+var array = [...iter];

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+//@target: ES6`
	`2`	`+var iter: Iterable<number>;`
	`3`	`+for (let num of iter) { }`