Merge branch 'master' into asyncGenerators

microsoft · rbuckton · Feb 17, 2017 · Oct 22, 2016 · Oct 26, 2016 · Oct 26, 2016
commit dedf4a7538fd4fd4f1f7c2bbd235ae9b87b3ee1f
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1803,18 +1803,22 @@
         "category": "Error",
         "code": 2545
     },
-    "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property.": {
+    "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'.": {
         "category": "Error",
         "code": 2546
     },
-    "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
+    "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property.": {
         "category": "Error",
         "code": 2547
     },
-    "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
+    "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
         "category": "Error",
         "code": 2548
     },
+    "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator.": {
+        "category": "Error",
+        "code": 2549
+    },
     "JSX element attributes type '{0}' may not be a union type.": {
         "category": "Error",
         "code": 2600

diff --git a/tests/baselines/reference/ES5For-of36.errors.txt b/tests/baselines/reference/ES5For-of36.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/statements/for-ofStatements/ES5For-of36.ts(1,10): error TS2547: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
+tests/cases/conformance/statements/for-ofStatements/ES5For-of36.ts(1,10): error TS2548: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
 
 
 ==== tests/cases/conformance/statements/for-ofStatements/ES5For-of36.ts (1 errors) ====
     for (let [a = 0, b = 1] of [2, 3]) {
              ~~~~~~~~~~~~~~
-!!! error TS2547: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
+!!! error TS2548: Type 'number' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator.
         a;
         b;
     }