Merge branch 'master' into ownJsonParsing

microsoft · sheetalkamat · Jun 15, 2017 · Nov 11, 2016 · Nov 14, 2016 · Nov 16, 2016
commit 48189c883f4e5f4549d98d6e7deb3e8d79d1b204
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -883,14 +883,31 @@
         "category": "Error",
         "code": 1322
     },
-    "String literal with double quotes expected.": {
+    "Dynamic import cannot be used when targeting ECMAScript 2015 modules.": {
         "category": "Error",
         "code": 1323
     },
-    "Property value can only be string literal, numeric literal, 'true', 'false', 'null', object literal or array literal.": {
+    "Dynamic import must have one specifier as an argument.": {
         "category": "Error",
         "code": 1324
     },
+    "Specifier of dynamic import cannot be spread element.": {
+        "category": "Error",
+        "code": 1325
+    },
+    "Dynamic import cannot have type arguments": {
+        "category": "Error",
+        "code": 1326
+    },
+    "String literal with double quotes expected.": {
+        "category": "Error",
+        "code": 1327
+    },
+    "Property value can only be string literal, numeric literal, 'true', 'false', 'null', object literal or array literal.": {
+        "category": "Error",
+        "code": 1328
+    },
+
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -3612,7 +3629,7 @@
         "category": "Message",
         "code": 90024
     },
-    
+
     "Convert function to an ES2015 class": {
         "category": "Message",
         "code": 95001