@typescript-deploys/pr-build 4.9.0-pr-50306-2 → 4.9.0-pr-50309-2

package/lib/tsc.js

@@ -1005,6 +1005,10 @@ var ts;
             : undefined;
     }
     ts.singleOrUndefined = singleOrUndefined;
+    function single(array) {
+        return ts.Debug.checkDefined(singleOrUndefined(array));
+    }
+    ts.single = single;
     function singleOrMany(array) {
         return array && array.length === 1
             ? array[0]
@@ -4456,6 +4460,7 @@ var ts;
     ts.sys = (function () {
         var byteOrderMarkIndicator = "\uFEFF";
         function getNodeSystem() {
+            var _a;
             var nativePattern = /^native |^\([^)]+\)$|^(internal[\\/]|[a-zA-Z0-9_\s]+(\.js)?$)/;
             var _fs = require("fs");
             var _path = require("path");
@@ -4464,7 +4469,7 @@ var ts;
             try {
                 _crypto = require("crypto");
             }
-            catch (_a) {
+            catch (_b) {
                 _crypto = undefined;
             }
             var activeSession;
@@ -4475,10 +4480,10 @@ var ts;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
-            var fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
+            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
-            var _b = createSystemWatchFunctions({
+            var _c = createSystemWatchFunctions({
                 pollingWatchFile: createSingleFileWatcherPerName(fsWatchFileWorker, useCaseSensitiveFileNames),
                 getModifiedTime: getModifiedTime,
                 setTimeout: setTimeout,
@@ -4496,7 +4501,7 @@ var ts;
                 defaultWatchFileKind: function () { var _a, _b; return (_b = (_a = sys).defaultWatchFileKind) === null || _b === void 0 ? void 0 : _b.call(_a); },
                 inodeWatching: isLinuxOrMacOs,
                 sysLog: sysLog,
-            }), watchFile = _b.watchFile, watchDirectory = _b.watchDirectory;
+            }), watchFile = _c.watchFile, watchDirectory = _c.watchDirectory;
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -4846,12 +4851,9 @@ var ts;
             function getDirectories(path) {
                 return getAccessibleFileSystemEntries(path).directories.slice();
             }
-            function fsRealPathHandlingLongPath(path) {
-                return path.length < 260 ? _fs.realpathSync.native(path) : _fs.realpathSync(path);
-            }
             function realpath(path) {
                 try {
-                    return fsRealpath(path);
+                    return realpathSync(path);
                 }
                 catch (_a) {
                     return path;
@@ -6059,7 +6061,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashno_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node` and then add 'node' to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slash_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @types/jquery` and then add 'jquery' to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_types_Slashjest_or_npm_i_save_dev_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_type_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i --save-dev @types/jest` or `npm i --save-dev @types/mocha` and then add 'jest' or 'mocha' to the types field in your tsconfig."),
-        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
+        This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag_2594", "This module is declared with 'export =', and can only be used with a default import when using the '{0}' flag."),
         _0_can_only_be_imported_by_using_a_default_import: diag(2595, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_default_import_2595", "'{0}' can only be imported by using a default import."),
         _0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import: diag(2596, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import_2596", "'{0}' can only be imported by turning on the 'esModuleInterop' flag and using a default import."),
         _0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import: diag(2597, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import_2597", "'{0}' can only be imported by using a 'require' call or by using a default import."),
@@ -14167,7 +14169,7 @@ var ts;
                 }
                 diagnostics = nonFileDiagnostics;
             }
-            ts.insertSorted(diagnostics, diagnostic, compareDiagnostics);
+            ts.insertSorted(diagnostics, diagnostic, compareDiagnosticsSkipRelatedInformation);
         }
         function getGlobalDiagnostics() {
             hasReadNonFileDiagnostics = true;
@@ -41939,7 +41941,7 @@ var ts;
                         var exportAssignment = exportEqualsSymbol.valueDeclaration;
                         var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
                         if (exportAssignment) {
-                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
                         }
                     }
                     else {

package/lib/tsserver.js

@@ -1163,6 +1163,13 @@ var ts;
             : undefined;
     }
     ts.singleOrUndefined = singleOrUndefined;
+    /**
+     * Returns the only element of an array if it contains only one element; throws otherwise.
+     */
+    function single(array) {
+        return ts.Debug.checkDefined(singleOrUndefined(array));
+    }
+    ts.single = single;
     function singleOrMany(array) {
         return array && array.length === 1
             ? array[0]
@@ -7030,6 +7037,7 @@ var ts;
         // not actually work.
         var byteOrderMarkIndicator = "\uFEFF";
         function getNodeSystem() {
+            var _a;
             var nativePattern = /^native |^\([^)]+\)$|^(internal[\\/]|[a-zA-Z0-9_\s]+(\.js)?$)/;
             var _fs = require("fs");
             var _path = require("path");
@@ -7039,7 +7047,7 @@ var ts;
             try {
                 _crypto = require("crypto");
             }
-            catch (_a) {
+            catch (_b) {
                 _crypto = undefined;
             }
             var activeSession;
@@ -7050,10 +7058,10 @@ var ts;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
-            var fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
+            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
-            var _b = createSystemWatchFunctions({
+            var _c = createSystemWatchFunctions({
                 pollingWatchFile: createSingleFileWatcherPerName(fsWatchFileWorker, useCaseSensitiveFileNames),
                 getModifiedTime: getModifiedTime,
                 setTimeout: setTimeout,
@@ -7073,7 +7081,7 @@ var ts;
                 defaultWatchFileKind: function () { var _a, _b; return (_b = (_a = sys).defaultWatchFileKind) === null || _b === void 0 ? void 0 : _b.call(_a); },
                 inodeWatching: isLinuxOrMacOs,
                 sysLog: sysLog,
-            }), watchFile = _b.watchFile, watchDirectory = _b.watchDirectory;
+            }), watchFile = _c.watchFile, watchDirectory = _c.watchDirectory;
             var nodeSystem = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
@@ -7466,12 +7474,9 @@ var ts;
             function getDirectories(path) {
                 return getAccessibleFileSystemEntries(path).directories.slice();
             }
-            function fsRealPathHandlingLongPath(path) {
-                return path.length < 260 ? _fs.realpathSync.native(path) : _fs.realpathSync(path);
-            }
             function realpath(path) {
                 try {
-                    return fsRealpath(path);
+                    return realpathSync(path);
                 }
                 catch (_a) {
                     return path;
@@ -8901,7 +8906,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_save_dev_types_Slashno_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node` and then add 'node' to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_save_dev_types_Slash_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @types/jquery` and then add 'jquery' to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_types_Slashjest_or_npm_i_save_dev_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_save_dev_type_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i --save-dev @types/jest` or `npm i --save-dev @types/mocha` and then add 'jest' or 'mocha' to the types field in your tsconfig."),
-        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
+        This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag_2594", "This module is declared with 'export =', and can only be used with a default import when using the '{0}' flag."),
         _0_can_only_be_imported_by_using_a_default_import: diag(2595, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_default_import_2595", "'{0}' can only be imported by using a default import."),
         _0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import: diag(2596, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import_2596", "'{0}' can only be imported by turning on the 'esModuleInterop' flag and using a default import."),
         _0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import: diag(2597, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_a_require_call_or_by_using_a_default_import_2597", "'{0}' can only be imported by using a 'require' call or by using a default import."),
@@ -18128,7 +18133,7 @@ var ts;
                 }
                 diagnostics = nonFileDiagnostics;
             }
-            ts.insertSorted(diagnostics, diagnostic, compareDiagnostics);
+            ts.insertSorted(diagnostics, diagnostic, compareDiagnosticsSkipRelatedInformation);
         }
         function getGlobalDiagnostics() {
             hasReadNonFileDiagnostics = true;
@@ -51055,7 +51060,7 @@ var ts;
                         var exportAssignment = exportEqualsSymbol.valueDeclaration;
                         var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
                         if (exportAssignment) {
-                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
                         }
                     }
                     else {
@@ -138495,6 +138500,8 @@ var ts;
                 // Similarly, skip past the symbol for 'export ='
                 if (importedSymbol.escapedName === "export=") {
                     importedSymbol = getExportEqualsLocalSymbol(importedSymbol, checker);
+                    if (importedSymbol === undefined)
+                        return undefined;
                 }
                 // If the import has a different name than the export, do not continue searching.
                 // If `importedName` is undefined, do continue searching as the export is anonymous.
@@ -138516,19 +138523,19 @@ var ts;
         FindAllReferences.getImportOrExportSymbol = getImportOrExportSymbol;
         function getExportEqualsLocalSymbol(importedSymbol, checker) {
             if (importedSymbol.flags & 2097152 /* Alias */) {
-                return ts.Debug.checkDefined(checker.getImmediateAliasedSymbol(importedSymbol));
+                return checker.getImmediateAliasedSymbol(importedSymbol);
             }
             var decl = ts.Debug.checkDefined(importedSymbol.valueDeclaration);
             if (ts.isExportAssignment(decl)) { // `export = class {}`
-                return ts.Debug.checkDefined(decl.expression.symbol);
+                return decl.expression.symbol;
             }
             else if (ts.isBinaryExpression(decl)) { // `module.exports = class {}`
-                return ts.Debug.checkDefined(decl.right.symbol);
+                return decl.right.symbol;
             }
             else if (ts.isSourceFile(decl)) { // json module
-                return ts.Debug.checkDefined(decl.symbol);
+                return decl.symbol;
             }
-            return ts.Debug.fail();
+            return undefined;
         }
         // If a reference is a class expression, the exported node would be its parent.
         // If a reference is a variable declaration, the exported node would be the variable statement.
@@ -154805,13 +154812,15 @@ var ts;
             errorCodes: errorCodes,
             getCodeActions: function (context) {
                 var errorCode = context.errorCode, preferences = context.preferences, sourceFile = context.sourceFile, span = context.span, program = context.program;
-                var info = getFixesInfo(context, errorCode, span.start, /*useAutoImportProvider*/ true);
+                var info = getFixInfos(context, errorCode, span.start, /*useAutoImportProvider*/ true);
                 if (!info)
                     return undefined;
-                var fixes = info.fixes, symbolName = info.symbolName, errorIdentifierText = info.errorIdentifierText;
                 var quotePreference = ts.getQuotePreference(sourceFile, preferences);
-                return fixes.map(function (fix) { return codeActionForFix(context, sourceFile, symbolName, fix, 
-                /*includeSymbolNameInDescription*/ symbolName !== errorIdentifierText, quotePreference, program.getCompilerOptions()); });
+                return info.map(function (_a) {
+                    var fix = _a.fix, symbolName = _a.symbolName, errorIdentifierText = _a.errorIdentifierText;
+                    return codeActionForFix(context, sourceFile, symbolName, fix, 
+                    /*includeSymbolNameInDescription*/ symbolName !== errorIdentifierText, quotePreference, program.getCompilerOptions());
+                });
             },
             fixIds: [importFixId],
             getAllCodeActions: function (context) {
@@ -154836,10 +154845,10 @@ var ts;
             var newImports = new ts.Map();
             return { addImportFromDiagnostic: addImportFromDiagnostic, addImportFromExportedSymbol: addImportFromExportedSymbol, writeFixes: writeFixes, hasFixes: hasFixes };
             function addImportFromDiagnostic(diagnostic, context) {
-                var info = getFixesInfo(context, diagnostic.code, diagnostic.start, useAutoImportProvider);
-                if (!info || !info.fixes.length)
+                var info = getFixInfos(context, diagnostic.code, diagnostic.start, useAutoImportProvider);
+                if (!info || !info.length)
                     return;
-                addImport(info);
+                addImport(ts.first(info));
             }
             function addImportFromExportedSymbol(exportedSymbol, isValidTypeOnlyUseSite) {
                 var moduleSymbol = ts.Debug.checkDefined(exportedSymbol.parent);
@@ -154850,13 +154859,12 @@ var ts;
                 var useRequire = shouldUseRequire(sourceFile, program);
                 var fix = getImportFixForSymbol(sourceFile, exportInfo, moduleSymbol, program, /*useNamespaceInfo*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
                 if (fix) {
-                    addImport({ fixes: [fix], symbolName: symbolName, errorIdentifierText: undefined });
+                    addImport({ fix: fix, symbolName: symbolName, errorIdentifierText: undefined });
                 }
             }
             function addImport(info) {
                 var _a, _b;
-                var fixes = info.fixes, symbolName = info.symbolName;
-                var fix = ts.first(fixes);
+                var fix = info.fix, symbolName = info.symbolName;
                 switch (fix.kind) {
                     case 0 /* UseNamespace */:
                         addToNamespace.push(fix);
@@ -155040,7 +155048,7 @@ var ts;
         codefix.getImportCompletionAction = getImportCompletionAction;
         function getPromoteTypeOnlyCompletionAction(sourceFile, symbolToken, program, host, formatContext, preferences) {
             var compilerOptions = program.getCompilerOptions();
-            var symbolName = getSymbolName(sourceFile, program.getTypeChecker(), symbolToken, compilerOptions);
+            var symbolName = ts.single(getSymbolNamesToImport(sourceFile, program.getTypeChecker(), symbolToken, compilerOptions));
             var fix = getTypeOnlyPromotionFix(sourceFile, symbolToken, symbolName, program);
             var includeSymbolNameInDescription = symbolName !== symbolToken.text;
             return fix && codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, includeSymbolNameInDescription, 1 /* Double */, compilerOptions));
@@ -155345,7 +155353,7 @@ var ts;
                 return { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier, importKind: importKind, addAsTypeOnly: addAsTypeOnly, useRequire: useRequire };
             }
         }
-        function getFixesInfo(context, errorCode, pos, useAutoImportProvider) {
+        function getFixInfos(context, errorCode, pos, useAutoImportProvider) {
             var symbolToken = ts.getTokenAtPosition(context.sourceFile, pos);
             var info;
             if (errorCode === ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code) {
@@ -155355,19 +155363,23 @@ var ts;
                 return undefined;
             }
             else if (errorCode === ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type.code) {
-                var symbolName_1 = getSymbolName(context.sourceFile, context.program.getTypeChecker(), symbolToken, context.program.getCompilerOptions());
+                var symbolName_1 = ts.single(getSymbolNamesToImport(context.sourceFile, context.program.getTypeChecker(), symbolToken, context.program.getCompilerOptions()));
                 var fix = getTypeOnlyPromotionFix(context.sourceFile, symbolToken, symbolName_1, context.program);
-                return fix && { fixes: [fix], symbolName: symbolName_1, errorIdentifierText: symbolToken.text };
+                return fix && [{ fix: fix, symbolName: symbolName_1, errorIdentifierText: symbolToken.text }];
             }
             else {
                 info = getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider);
             }
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(context.sourceFile, context.preferences, context.host);
-            return info && __assign(__assign({}, info), { fixes: sortFixes(info.fixes, context.sourceFile, context.program, packageJsonImportFilter, context.host) });
+            return info && sortFixInfo(info, context.sourceFile, context.program, packageJsonImportFilter, context.host);
         }
-        function sortFixes(fixes, sourceFile, program, packageJsonImportFilter, host) {
+        function sortFixInfo(fixes, sourceFile, program, packageJsonImportFilter, host) {
             var _toPath = function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), ts.hostGetCanonicalFileName(host)); };
-            return ts.sort(fixes, function (a, b) { return ts.compareValues(a.kind, b.kind) || compareModuleSpecifiers(a, b, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier, _toPath); });
+            return ts.sort(fixes, function (a, b) {
+                return ts.compareBooleans(!!a.isJsxNamespaceFix, !!b.isJsxNamespaceFix) ||
+                    ts.compareValues(a.fix.kind, b.fix.kind) ||
+                    compareModuleSpecifiers(a.fix, b.fix, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier, _toPath);
+            });
         }
         function getBestFix(fixes, sourceFile, program, packageJsonImportFilter, host) {
             if (!ts.some(fixes))
@@ -155418,7 +155430,6 @@ var ts;
             return 0 /* EqualTo */;
         }
         function getFixesInfoForUMDImport(_a, token) {
-            var _b;
             var sourceFile = _a.sourceFile, program = _a.program, host = _a.host, preferences = _a.preferences;
             var checker = program.getTypeChecker();
             var umdSymbol = getUmdSymbol(token, checker);
@@ -155430,7 +155441,7 @@ var ts;
             var useRequire = shouldUseRequire(sourceFile, program);
             var position = ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined;
             var fixes = getImportFixes(exportInfo, position ? { position: position, symbolName: symbolName } : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences).fixes;
-            return { fixes: fixes, symbolName: symbolName, errorIdentifierText: (_b = ts.tryCast(token, ts.isIdentifier)) === null || _b === void 0 ? void 0 : _b.text };
+            return fixes.map(function (fix) { var _a; return ({ fix: fix, symbolName: symbolName, errorIdentifierText: (_a = ts.tryCast(token, ts.isIdentifier)) === null || _a === void 0 ? void 0 : _a.text }); });
         }
         function getUmdSymbol(token, checker) {
             // try the identifier to see if it is the umd symbol
@@ -155491,19 +155502,20 @@ var ts;
             var sourceFile = _a.sourceFile, program = _a.program, cancellationToken = _a.cancellationToken, host = _a.host, preferences = _a.preferences;
             var checker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
-            var symbolName = getSymbolName(sourceFile, checker, symbolToken, compilerOptions);
-            // "default" is a keyword and not a legal identifier for the import, but appears as an identifier.
-            if (symbolName === "default" /* Default */) {
-                return undefined;
-            }
-            var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(symbolToken);
-            var useRequire = shouldUseRequire(sourceFile, program);
-            var exportInfo = getExportInfos(symbolName, ts.isJSXTagName(symbolToken), ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
-            var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfo.entries(), function (_a) {
-                var _ = _a[0], exportInfos = _a[1];
-                return getImportFixes(exportInfos, { symbolName: symbolName, position: symbolToken.getStart(sourceFile) }, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes;
-            }));
-            return { fixes: fixes, symbolName: symbolName, errorIdentifierText: symbolToken.text };
+            return ts.flatMap(getSymbolNamesToImport(sourceFile, checker, symbolToken, compilerOptions), function (symbolName) {
+                // "default" is a keyword and not a legal identifier for the import, but appears as an identifier.
+                if (symbolName === "default" /* Default */) {
+                    return undefined;
+                }
+                var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(symbolToken);
+                var useRequire = shouldUseRequire(sourceFile, program);
+                var exportInfo = getExportInfos(symbolName, ts.isJSXTagName(symbolToken), ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
+                var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfo.entries(), function (_a) {
+                    var _ = _a[0], exportInfos = _a[1];
+                    return getImportFixes(exportInfos, { symbolName: symbolName, position: symbolToken.getStart(sourceFile) }, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes;
+                }));
+                return fixes.map(function (fix) { return ({ fix: fix, symbolName: symbolName, errorIdentifierText: symbolToken.text, isJsxNamespaceFix: symbolName !== symbolToken.text }); });
+            });
         }
         function getTypeOnlyPromotionFix(sourceFile, symbolToken, symbolName, program) {
             var checker = program.getTypeChecker();
@@ -155515,15 +155527,16 @@ var ts;
                 return undefined;
             return { kind: 4 /* PromoteTypeOnly */, typeOnlyAliasDeclaration: typeOnlyAliasDeclaration };
         }
-        function getSymbolName(sourceFile, checker, symbolToken, compilerOptions) {
+        function getSymbolNamesToImport(sourceFile, checker, symbolToken, compilerOptions) {
             var parent = symbolToken.parent;
             if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && ts.jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
                 var jsxNamespace = checker.getJsxNamespace(sourceFile);
                 if (needsJsxNamespaceFix(jsxNamespace, symbolToken, checker)) {
-                    return jsxNamespace;
+                    var needsComponentNameFix = !ts.isIntrinsicJsxName(symbolToken.text) && !checker.resolveName(symbolToken.text, symbolToken, 111551 /* Value */, /*excludeGlobals*/ false);
+                    return needsComponentNameFix ? [symbolToken.text, jsxNamespace] : [jsxNamespace];
                 }
             }
-            return symbolToken.text;
+            return [symbolToken.text];
         }
         function needsJsxNamespaceFix(jsxNamespace, symbolToken, checker) {
             if (ts.isIntrinsicJsxName(symbolToken.text))