Update based on PR feedback

rbuckton · rbuckton · commit 3ff0a249d2ab · 2019-08-06T10:46:17.000-07:00
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -3645,7 +3645,7 @@ namespace ts {
                         return { value: o && o[i++], done: !o };
                     }
                 };
-                throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+                throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
             };`
     };
 
diff --git a/src/testRunner/unittests/evaluation/forOf.ts b/src/testRunner/unittests/evaluation/forOf.ts
@@ -66,7 +66,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {
         }
         `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
 
-        assert.throws(() => result.main(), "undefined is not iterable (cannot read property Symbol(Symbol.iterator))");
+        assert.throws(() => result.main(), /cannot read property.*Symbol\(Symbol\.iterator\).*/i);
     });
 
     it("es5 over object with no Symbol.iterator with no Symbol", () => {
@@ -93,7 +93,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {
         }
         `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
 
-        assert.throws(() => result.main(), "Object not iterable");
+        assert.throws(() => result.main(), "Object is not iterable");
     });
 
     it("es5 over object with Symbol.iterator", () => {
@@ -110,7 +110,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {
                 {
                     output.push(value)
                 }
-                
+
             }`, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
 
         result.main();
diff --git a/tests/baselines/reference/ES5For-of33.js b/tests/baselines/reference/ES5For-of33.js
diff --git a/tests/baselines/reference/ES5For-of33.sourcemap.txt b/tests/baselines/reference/ES5For-of33.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of33.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>try {
diff --git a/tests/baselines/reference/ES5For-of34.js b/tests/baselines/reference/ES5For-of34.js
diff --git a/tests/baselines/reference/ES5For-of34.sourcemap.txt b/tests/baselines/reference/ES5For-of34.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of34.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>function foo() {
diff --git a/tests/baselines/reference/ES5For-of35.js b/tests/baselines/reference/ES5For-of35.js
diff --git a/tests/baselines/reference/ES5For-of35.sourcemap.txt b/tests/baselines/reference/ES5For-of35.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of35.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>try {
diff --git a/tests/baselines/reference/ES5For-of36.js b/tests/baselines/reference/ES5For-of36.js
diff --git a/tests/baselines/reference/ES5For-of36.sourcemap.txt b/tests/baselines/reference/ES5For-of36.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of36.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var __read = (this && this.__read) || function (o, n) {
 >>>    var m = typeof Symbol === "function" && o[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5For-of37.js b/tests/baselines/reference/ES5For-of37.js
@@ -26,7 +26,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a, e_2, _b;
 try {
diff --git a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
@@ -43,7 +43,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 function a() {
     var _loop_1, _a, _b, i, e_1_1;
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -291,7 +291,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var C4 = /** @class */ (function () {
     function C4() {
@@ -373,7 +373,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var C5 = /** @class */ (function () {
     function C5() {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
@@ -245,7 +245,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 function f4() {
     return __asyncGenerator(this, arguments, function f4_1() {
@@ -322,7 +322,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 function f5() {
     return __asyncGenerator(this, arguments, function f5_1() {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
@@ -245,7 +245,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var f4 = function () {
     return __asyncGenerator(this, arguments, function () {
@@ -322,7 +322,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var f5 = function () {
     return __asyncGenerator(this, arguments, function () {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
@@ -265,7 +265,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var o4 = {
     f: function () {
@@ -344,7 +344,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var o5 = {
     f: function () {
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
@@ -74,7 +74,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 (function () {
     var a;

Original file line number	Diff line number	Diff line change
`@@ -3645,7 +3645,7 @@ namespace ts {`
`3645`	`3645`	`return { value: o && o[i++], done: !o };`
`3646`	`3646`	`}`
`3647`	`3647`	`};`
`3648`		`- throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");`
	`3648`	`+ throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");`
`3649`	`3649`	};`
`3650`	`3650`	`};`
`3651`	`3651`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {`
`66`	`66`	`}`
`67`	`67`	`, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
`68`	`68`
`69`		`- assert.throws(() => result.main(), "undefined is not iterable (cannot read property Symbol(Symbol.iterator))");`
	`69`	`+ assert.throws(() => result.main(), /cannot read property.Symbol\(Symbol\.iterator\)./i);`
`70`	`70`	`});`
`71`	`71`
`72`	`72`	`it("es5 over object with no Symbol.iterator with no Symbol", () => {`
`@@ -93,7 +93,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {`
`93`	`93`	`}`
`94`	`94`	`, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
`95`	`95`
`96`		`- assert.throws(() => result.main(), "Object not iterable");`
	`96`	`+ assert.throws(() => result.main(), "Object is not iterable");`
`97`	`97`	`});`
`98`	`98`
`99`	`99`	`it("es5 over object with Symbol.iterator", () => {`
`@@ -110,7 +110,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {`
`110`	`110`	`{`
`111`	`111`	`output.push(value)`
`112`	`112`	`}`
`113`		`-`
	`113`	`+`
`114`	`114`	}`, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
`115`	`115`
`116`	`116`	`result.main();`