Merge branch 'master' into new-jsx-transforms

src/compiler/commandLineParser.ts

@@ -2,16 +2,16 @@ namespace ts {
     /* @internal */
     export const compileOnSaveCommandLineOption: CommandLineOption = { name: "compileOnSave", type: "boolean" };
 
-    const jsxOptionMap = createMapFromTemplate({
+    const jsxOptionMap = new Map(getEntries({
         "preserve": JsxEmit.Preserve,
         "react-native": JsxEmit.ReactNative,
         "react": JsxEmit.React,
         "react-jsx": JsxEmit.ReactJSX,
         "react-jsxdev": JsxEmit.ReactJSXDev,
-    });
+    }));
 
     /* @internal */
-    export const inverseJsxOptionMap = mapMap(jsxOptionMap, (value, key) => ["" + value, key]);
+    export const inverseJsxOptionMap = new Map(arrayFrom(mapIterator(jsxOptionMap.entries(), ([key, value]: [string, JsxEmit]) => ["" + value, key] as const)));
 
     // NOTE: The order here is important to default lib ordering as entries will have the same
     //       order in the generated program (see `getDefaultLibPriority` in program.ts). This

src/compiler/diagnosticMessages.json

@@ -4500,9 +4500,21 @@
         "category": "Error",
         "code": 6234
     },
+    "Disable loading referenced projects.": {
+        "category": "Message",
+        "code": 6235
+    },
+    "Arguments for the rest parameter '{0}' were not provided.": {
+        "category": "Error",
+        "code": 6236
+    },
+    "Generates an event trace and a list of types.": {
+        "category": "Message",
+        "code": 6237
+    },
     "Specify the module specifier to be used to import the `jsx` and `jsxs` factory functions from. eg, react": {
         "category": "Error",
-        "code": 6235
+        "code": 6238
     },
 
     "Projects to reference": {