Add tests for destructuring 'for...of'

JsonFreeman · JsonFreeman · commit ed3ab96eed1c · 2015-03-04T19:35:13.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -10891,9 +10891,9 @@ module ts {
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
 
-        function isUnknownIdentifier(location: Node, name: string): boolean {
+        function isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean {
             return !resolveName(location, name, SymbolFlags.Value, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined) &&
-                !hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);
+                !hasProperty(getGeneratedNamesForSourceFile(sourceFile), name);
         }
 
         function getBlockScopedVariableId(n: Identifier): number {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1639,10 +1639,12 @@ module ts {
             }
 
             if (root) {
+                currentSourceFile = root;
                 emit(root);
             }
             else {
                 forEach(host.getSourceFiles(), sourceFile => {
+                    currentSourceFile = sourceFile;
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
                         emit(sourceFile);
                     }
@@ -1698,7 +1700,7 @@ module ts {
 
             function isExistingName(location: Node, name: string) {
                 // check if resolver is aware of this name (if name was seen during the typecheck)
-                if (!resolver.isUnknownIdentifier(location, name)) {
+                if (!resolver.isUnknownIdentifier(location, name, currentSourceFile)) {
                     return true;
                 }
 
@@ -5191,7 +5193,6 @@ module ts {
             }
 
             function emitSourceFile(node: SourceFile) {
-                currentSourceFile = node;
                 // Start new file on new line
                 writeLine();
                 emitDetachedComments(node);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1204,7 +1204,7 @@ module ts {
         isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;
         // Returns the constant value this property access resolves to, or 'undefined' for a non-constant
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isUnknownIdentifier(location: Node, name: string): boolean;
+        isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean;
         getBlockScopedVariableId(node: Identifier): number;
     }
 
diff --git a/tests/baselines/reference/ES5For-of26.js b/tests/baselines/reference/ES5For-of26.js
@@ -0,0 +1,12 @@
+//// [ES5For-of26.ts]
+for (var [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of26.js]
+for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of27.js b/tests/baselines/reference/ES5For-of27.js
@@ -0,0 +1,12 @@
+//// [ES5For-of27.ts]
+for (var {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of27.js]
+for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b.x, a = _c === void 0 ? 0 : _c, _d = _b.y, b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of28.js b/tests/baselines/reference/ES5For-of28.js
@@ -0,0 +1,12 @@
+//// [ES5For-of28.ts]
+for (let [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of28.js]
+for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b[0], a = _c === void 0 ? 0 : _c, _d = _b[1], b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of29.js b/tests/baselines/reference/ES5For-of29.js
@@ -0,0 +1,12 @@
+//// [ES5For-of29.ts]
+for (const {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
+
+//// [ES5For-of29.js]
+for (var _i = 0, _a = [2, 3]; _i < _a.length; _i++) {
+    var _b = _a[_i], _c = _b.x, a = _c === void 0 ? 0 : _c, _d = _b.y, b = _d === void 0 ? 1 : _d;
+    a;
+    b;
+}
diff --git a/tests/baselines/reference/ES5For-of30.js b/tests/baselines/reference/ES5For-of30.js
@@ -0,0 +1,17 @@
+//// [ES5For-of30.ts]
+var a: string, b: number;
+var tuple: [number, string] = [2, "3"];
+for ([a = 1, b = ""] of tuple) {
+    a;
+    b;
+}
+
+//// [ES5For-of30.js]
+var a, b;
+var tuple = [2, "3"];
+for (var _i = 0; _i < tuple.length; _i++) {
+    _a = tuple[_i], _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], b = _c === void 0 ? "" : _c;
+    a;
+    b;
+}
+var _a, _b, _c;
diff --git a/tests/baselines/reference/ES5For-of31.js b/tests/baselines/reference/ES5For-of31.js
@@ -0,0 +1,16 @@
+//// [ES5For-of31.ts]
+var a: string, b: number;
+
+for ({ a: b = 1, b: a = ""} of []) {
+    a;
+    b;
+}
+
+//// [ES5For-of31.js]
+var a, b;
+for (var _i = 0, _a = []; _i < _a.length; _i++) {
+    _b = _a[_i], _c = _b.a, b = _c === void 0 ? 1 : _c, _d = _b.b, a = _d === void 0 ? "" : _d;
+    a;
+    b;
+}
+var _b, _c, _d;
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of26.ts
@@ -0,0 +1,4 @@
+for (var [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of27.ts
@@ -0,0 +1,4 @@
+for (var {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of28.ts
@@ -0,0 +1,4 @@
+for (let [a = 0, b = 1] of [2, 3]) {
+    a;
+    b;
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of29.ts
@@ -0,0 +1,4 @@
+for (const {x: a = 0, y: b = 1} of [2, 3]) {
+    a;
+    b;
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts
@@ -0,0 +1,6 @@
+var a: string, b: number;
+var tuple: [number, string] = [2, "3"];
+for ([a = 1, b = ""] of tuple) {
+    a;
+    b;
+}
diff --git a/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts b/tests/cases/conformance/statements/for-ofStatements/ES5For-of31.ts
@@ -0,0 +1,6 @@
+var a: string, b: number;
+
+for ({ a: b = 1, b: a = ""} of []) {
+    a;
+    b;
+}

Original file line number	Diff line number	Diff line change
`@@ -10891,9 +10891,9 @@ module ts {`
`10891`	`10891`	`getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);`
`10892`	`10892`	`}`
`10893`	`10893`
`10894`		`- function isUnknownIdentifier(location: Node, name: string): boolean {`
	`10894`	`+ function isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean {`
`10895`	`10895`	`return !resolveName(location, name, SymbolFlags.Value, /nodeNotFoundMessage/ undefined, /nameArg/ undefined) &&`
`10896`		`- !hasProperty(getGeneratedNamesForSourceFile(getSourceFile(location)), name);`
	`10896`	`+ !hasProperty(getGeneratedNamesForSourceFile(sourceFile), name);`
`10897`	`10897`	`}`
`10898`	`10898`
`10899`	`10899`	`function getBlockScopedVariableId(n: Identifier): number {`
Original file line number	Diff line number	Diff line change
`@@ -1639,10 +1639,12 @@ module ts {`
`1639`	`1639`	`}`
`1640`	`1640`
`1641`	`1641`	`if (root) {`
	`1642`	`+ currentSourceFile = root;`
`1642`	`1643`	`emit(root);`
`1643`	`1644`	`}`
`1644`	`1645`	`else {`
`1645`	`1646`	`forEach(host.getSourceFiles(), sourceFile => {`
	`1647`	`+ currentSourceFile = sourceFile;`
`1646`	`1648`	`if (!isExternalModuleOrDeclarationFile(sourceFile)) {`
`1647`	`1649`	`emit(sourceFile);`
`1648`	`1650`	`}`
`@@ -1698,7 +1700,7 @@ module ts {`
`1698`	`1700`
`1699`	`1701`	`function isExistingName(location: Node, name: string) {`
`1700`	`1702`	`// check if resolver is aware of this name (if name was seen during the typecheck)`
`1701`		`- if (!resolver.isUnknownIdentifier(location, name)) {`
	`1703`	`+ if (!resolver.isUnknownIdentifier(location, name, currentSourceFile)) {`
`1702`	`1704`	`return true;`
`1703`	`1705`	`}`
`1704`	`1706`
`@@ -5191,7 +5193,6 @@ module ts {`
`5191`	`5193`	`}`
`5192`	`5194`
`5193`	`5195`	`function emitSourceFile(node: SourceFile) {`
`5194`		`- currentSourceFile = node;`
`5195`	`5196`	`// Start new file on new line`
`5196`	`5197`	`writeLine();`
`5197`	`5198`	`emitDetachedComments(node);`
Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ module ts {`
`1204`	`1204`	`isEntityNameVisible(entityName: EntityName, enclosingDeclaration: Node): SymbolVisibilityResult;`
`1205`	`1205`	`// Returns the constant value this property access resolves to, or 'undefined' for a non-constant`
`1206`	`1206`	`getConstantValue(node: EnumMember \| PropertyAccessExpression \| ElementAccessExpression): number;`
`1207`		`- isUnknownIdentifier(location: Node, name: string): boolean;`
	`1207`	`+ isUnknownIdentifier(location: Node, name: string, sourceFile: SourceFile): boolean;`
`1208`	`1208`	`getBlockScopedVariableId(node: Identifier): number;`
`1209`	`1209`	`}`
`1210`	`1210`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +for (var [a = 0, b = 1] of [2, 3]) {
 +    a;
 +    b;
 +}