typescript 4.7.0-dev.20220422 → 4.7.0-dev.20220425

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220422";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220425";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -14702,7 +14702,7 @@ var ts;
         var _a;
         // If we don't need to downlevel and we can reach the original source text using
         // the node's parent reference, then simply get the text as it was originally written.
-        if (canUseOriginalText(node, flags)) {
+        if (sourceFile && canUseOriginalText(node, flags)) {
             return getSourceTextOfNodeFromSourceFile(sourceFile, node);
         }
         // If we can't reach the original source text, use the canonical form if it's a number,
@@ -75670,6 +75670,7 @@ var ts;
             // decorators are applied to a declaration by the emitter, and not to an expression.
             var isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
             var argCheckMode = !isDecorator && !isSingleNonGenericCandidate && ts.some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
+            argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
             // The following variables are captured and modified by calls to chooseOverload.
             // If overload resolution or type argument inference fails, we want to report the
             // best error possible. The best error is one which says that an argument was not
@@ -75885,7 +75886,7 @@ var ts;
                         // If one or more context sensitive arguments were excluded, we start including
                         // them now (and keeping do so for any subsequent candidates) and perform a second
                         // round of type inference and applicability checking for this particular candidate.
-                        argCheckMode = 0 /* Normal */;
+                        argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
                         if (inferenceContext) {
                             var typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
                             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -110514,7 +110515,7 @@ var ts;
             setWriter(/*output*/ undefined, /*_sourceMapGenerator*/ undefined);
         }
         function getCurrentLineMap() {
-            return currentLineMap || (currentLineMap = ts.getLineStarts(currentSourceFile));
+            return currentLineMap || (currentLineMap = ts.getLineStarts(ts.Debug.checkDefined(currentSourceFile)));
         }
         function emit(node, parenthesizerRule) {
             if (node === undefined)
@@ -111689,7 +111690,7 @@ var ts;
                 increaseIndent();
             }
             var preferNewLine = node.multiLine ? 65536 /* PreferNewLine */ : 0 /* None */;
-            var allowTrailingComma = currentSourceFile.languageVersion >= 1 /* ES5 */ && !ts.isJsonSourceFile(currentSourceFile) ? 64 /* AllowTrailingComma */ : 0 /* None */;
+            var allowTrailingComma = currentSourceFile && currentSourceFile.languageVersion >= 1 /* ES5 */ && !ts.isJsonSourceFile(currentSourceFile) ? 64 /* AllowTrailingComma */ : 0 /* None */;
             emitList(node, node.properties, 526226 /* ObjectLiteralExpressionProperties */ | allowTrailingComma | preferNewLine);
             if (indentedFlag) {
                 decreaseIndent();
@@ -112045,7 +112046,7 @@ var ts;
             emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfExpressionStatement);
             // Emit semicolon in non json files
             // or if json file that created synthesized expression(eg.define expression statement when --out and amd code generation)
-            if (!ts.isJsonSourceFile(currentSourceFile) || ts.nodeIsSynthesized(node.expression)) {
+            if (!currentSourceFile || !ts.isJsonSourceFile(currentSourceFile) || ts.nodeIsSynthesized(node.expression)) {
                 writeTrailingSemicolon();
             }
         }
@@ -112338,7 +112339,7 @@ var ts;
             if (body.multiLine) {
                 return false;
             }
-            if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
+            if (!ts.nodeIsSynthesized(body) && currentSourceFile && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
             if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
@@ -112363,12 +112364,7 @@ var ts;
             var emitBlockFunctionBody = shouldEmitBlockFunctionBodyOnSingleLine(body)
                 ? emitBlockFunctionBodyOnSingleLine
                 : emitBlockFunctionBodyWorker;
-            if (emitBodyWithDetachedComments) {
-                emitBodyWithDetachedComments(body, body.statements, emitBlockFunctionBody);
-            }
-            else {
-                emitBlockFunctionBody(body);
-            }
+            emitBodyWithDetachedComments(body, body.statements, emitBlockFunctionBody);
             decreaseIndent();
             writeToken(19 /* CloseBraceToken */, body.statements.end, writePunctuation, body);
             onAfterEmitNode === null || onAfterEmitNode === void 0 ? void 0 : onAfterEmitNode(body);
@@ -112765,7 +112761,8 @@ var ts;
             var emitAsSingleStatement = statements.length === 1 &&
                 (
                 // treat synthesized nodes as located on the same line for emit purposes
-                ts.nodeIsSynthesized(parentNode) ||
+                !currentSourceFile ||
+                    ts.nodeIsSynthesized(parentNode) ||
                     ts.nodeIsSynthesized(statements[0]) ||
                     ts.rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile));
             var format = 163969 /* CaseOrDefaultClauseStatements */;
@@ -112996,16 +112993,14 @@ var ts;
         function emitSourceFile(node) {
             writeLine();
             var statements = node.statements;
-            if (emitBodyWithDetachedComments) {
-                // Emit detached comment if there are no prologue directives or if the first node is synthesized.
-                // The synthesized node will have no leading comment so some comments may be missed.
-                var shouldEmitDetachedComment = statements.length === 0 ||
-                    !ts.isPrologueDirective(statements[0]) ||
-                    ts.nodeIsSynthesized(statements[0]);
-                if (shouldEmitDetachedComment) {
-                    emitBodyWithDetachedComments(node, statements, emitSourceFileWorker);
-                    return;
-                }
+            // Emit detached comment if there are no prologue directives or if the first node is synthesized.
+            // The synthesized node will have no leading comment so some comments may be missed.
+            var shouldEmitDetachedComment = statements.length === 0 ||
+                !ts.isPrologueDirective(statements[0]) ||
+                ts.nodeIsSynthesized(statements[0]);
+            if (shouldEmitDetachedComment) {
+                emitBodyWithDetachedComments(node, statements, emitSourceFileWorker);
+                return;
             }
             emitSourceFileWorker(node);
         }
@@ -113394,7 +113389,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && (!parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile)))) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && (!parentNode || currentSourceFile && ts.rangeIsOnSingleLine(parentNode, currentSourceFile)))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -113655,7 +113650,7 @@ var ts;
                 }
                 var firstChild_1 = children[0];
                 if (firstChild_1 === undefined) {
-                    return !parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
+                    return !parentNode || currentSourceFile && ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
                 if (firstChild_1.pos === nextListElementPos) {
                     // If this child starts at the beginning of a list item in a parent list, its leading
@@ -113679,7 +113674,7 @@ var ts;
                     // JsxText will be written with its leading whitespace, so don't add more manually.
                     return 0;
                 }
-                if (parentNode &&
+                if (currentSourceFile && parentNode &&
                     !ts.positionIsSynthesized(parentNode.pos) &&
                     !ts.nodeIsSynthesized(firstChild_1) &&
                     (!firstChild_1.parent || ts.getOriginalNode(firstChild_1.parent) === ts.getOriginalNode(parentNode))) {
@@ -113703,7 +113698,7 @@ var ts;
                     // JsxText will be written with its leading whitespace, so don't add more manually.
                     return 0;
                 }
-                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode)) {
+                else if (currentSourceFile && !ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode)) {
                     if (preserveSourceNewlines && siblingNodePositionsAreComparable(previousNode, nextNode)) {
                         return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
                     }
@@ -113735,9 +113730,9 @@ var ts;
                 }
                 var lastChild = ts.lastOrUndefined(children);
                 if (lastChild === undefined) {
-                    return !parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
+                    return !parentNode || currentSourceFile && ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                if (parentNode && !ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
+                if (currentSourceFile && parentNode && !ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
                     if (preserveSourceNewlines) {
                         var end_1 = ts.isNodeArray(children) && !ts.positionIsSynthesized(children.end) ? children.end : lastChild.end;
                         return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(end_1, parentNode.end, currentSourceFile, includeComments); });
@@ -113810,7 +113805,7 @@ var ts;
             if (ts.getStartsOnNewLine(node2)) {
                 return 1;
             }
-            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+            if (currentSourceFile && !ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
                 if (preserveSourceNewlines) {
                     return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
                 }
@@ -113820,7 +113815,7 @@ var ts;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
-                && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
+                && (!currentSourceFile || ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile));
         }
         function skipSynthesizedParentheses(node) {
             while (node.kind === 212 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
@@ -113832,16 +113827,23 @@ var ts;
             if (ts.isGeneratedIdentifier(node)) {
                 return generateName(node);
             }
-            else if ((ts.isIdentifier(node) || ts.isPrivateIdentifier(node)) && (ts.nodeIsSynthesized(node) || !node.parent || !currentSourceFile || (node.parent && currentSourceFile && ts.getSourceFileOfNode(node) !== ts.getOriginalNode(currentSourceFile)))) {
-                return ts.idText(node);
-            }
-            else if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) {
+            if (ts.isStringLiteral(node) && node.textSourceNode) {
                 return getTextOfNode(node.textSourceNode, includeTrivia);
             }
-            else if (ts.isLiteralExpression(node) && (ts.nodeIsSynthesized(node) || !node.parent)) {
-                return node.text;
+            var sourceFile = currentSourceFile; // const needed for control flow
+            var canUseSourceFile = !!sourceFile && !!node.parent && !ts.nodeIsSynthesized(node);
+            if (ts.isMemberName(node)) {
+                if (!canUseSourceFile || ts.getSourceFileOfNode(node) !== ts.getOriginalNode(sourceFile)) {
+                    return ts.idText(node);
+                }
+            }
+            else {
+                ts.Debug.assertNode(node, ts.isLiteralExpression); // not strictly necessary
+                if (!canUseSourceFile) {
+                    return node.text;
+                }
             }
-            return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
+            return ts.getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia);
         }
         function getLiteralTextOfNode(node, neverAsciiEscape, jsxAttributeEscape) {
             if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) {
@@ -114420,7 +114422,7 @@ var ts;
             return true;
         }
         function emitLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos) {
-            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+            if (!currentSourceFile || !shouldWriteComment(currentSourceFile.text, commentPos))
                 return;
             if (!hasWrittenComment) {
                 ts.emitNewLineBeforeLeadingCommentOfPosition(getCurrentLineMap(), writer, rangePos, commentPos);
@@ -114447,7 +114449,7 @@ var ts;
             forEachTrailingCommentToEmit(pos, emitTrailingComment);
         }
         function emitTrailingComment(commentPos, commentEnd, _kind, hasTrailingNewLine) {
-            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+            if (!currentSourceFile || !shouldWriteComment(currentSourceFile.text, commentPos))
                 return;
             // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment2*/
             if (!writer.isAtStartOfLine()) {
@@ -114469,6 +114471,8 @@ var ts;
             exitComment();
         }
         function emitTrailingCommentOfPositionNoNewline(commentPos, commentEnd, kind) {
+            if (!currentSourceFile)
+                return;
             // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
             emitPos(commentPos);
             ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
@@ -114478,6 +114482,8 @@ var ts;
             }
         }
         function emitTrailingCommentOfPosition(commentPos, commentEnd, _kind, hasTrailingNewLine) {
+            if (!currentSourceFile)
+                return;
             // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
             emitPos(commentPos);
             ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
@@ -114510,6 +114516,8 @@ var ts;
             return detachedCommentsInfo !== undefined && ts.last(detachedCommentsInfo).nodePos === pos;
         }
         function forEachLeadingCommentWithoutDetachedComments(cb) {
+            if (!currentSourceFile)
+                return;
             // get the leading comments from detachedPos
             var pos = ts.last(detachedCommentsInfo).detachedCommentEndPos;
             if (detachedCommentsInfo.length - 1) {
@@ -114521,7 +114529,7 @@ var ts;
             ts.forEachLeadingCommentRange(currentSourceFile.text, pos, cb, /*state*/ pos);
         }
         function emitDetachedCommentsAndUpdateCommentsInfo(range) {
-            var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile.text, getCurrentLineMap(), writer, emitComment, range, newLine, commentsDisabled);
+            var currentDetachedCommentInfo = currentSourceFile && ts.emitDetachedComments(currentSourceFile.text, getCurrentLineMap(), writer, emitComment, range, newLine, commentsDisabled);
             if (currentDetachedCommentInfo) {
                 if (detachedCommentsInfo) {
                     detachedCommentsInfo.push(currentDetachedCommentInfo);
@@ -114532,7 +114540,7 @@ var ts;
             }
         }
         function emitComment(text, lineMap, writer, commentPos, commentEnd, newLine) {
-            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+            if (!currentSourceFile || !shouldWriteComment(currentSourceFile.text, commentPos))
                 return;
             emitPos(commentPos);
             ts.writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine);
@@ -114544,7 +114552,7 @@ var ts;
          * @return true if the comment is a triple-slash comment else false
          */
         function isTripleSlashComment(commentPos, commentEnd) {
-            return ts.isRecognizedTripleSlashComment(currentSourceFile.text, commentPos, commentEnd);
+            return !!currentSourceFile && ts.isRecognizedTripleSlashComment(currentSourceFile.text, commentPos, commentEnd);
         }
         // Source Maps
         function getParsedSourceMap(node) {
@@ -131107,7 +131115,7 @@ var ts;
             GlobalsSearch[GlobalsSearch["Success"] = 1] = "Success";
             GlobalsSearch[GlobalsSearch["Fail"] = 2] = "Fail";
         })(GlobalsSearch || (GlobalsSearch = {}));
-        function resolvingModuleSpecifiers(logPrefix, host, program, sourceFile, preferences, isForImportStatementCompletion, cb) {
+        function resolvingModuleSpecifiers(logPrefix, host, program, sourceFile, position, preferences, isForImportStatementCompletion, isValidTypeOnlyUseSite, cb) {
             var _a, _b, _c;
             var start = ts.timestamp();
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(sourceFile, preferences, host);
@@ -131122,9 +131130,9 @@ var ts;
             (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, logPrefix + ": response is " + (resolutionLimitExceeded ? "incomplete" : "complete"));
             (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, logPrefix + ": " + (ts.timestamp() - start));
             return result;
-            function tryResolve(exportInfo, isFromAmbientModule) {
+            function tryResolve(exportInfo, symbolName, isFromAmbientModule) {
                 if (isFromAmbientModule) {
-                    var result_1 = ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, sourceFile, program, host, preferences);
+                    var result_1 = ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, symbolName, position, isValidTypeOnlyUseSite, sourceFile, program, host, preferences);
                     if (result_1) {
                         ambientCount++;
                     }
@@ -131133,7 +131141,7 @@ var ts;
                 var shouldResolveModuleSpecifier = isForImportStatementCompletion || preferences.allowIncompleteCompletions && resolvedCount < Completions.moduleSpecifierResolutionLimit;
                 var shouldGetModuleSpecifierFromCache = !shouldResolveModuleSpecifier && preferences.allowIncompleteCompletions && cacheAttemptCount < Completions.moduleSpecifierResolutionCacheAttemptLimit;
                 var result = (shouldResolveModuleSpecifier || shouldGetModuleSpecifierFromCache)
-                    ? ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, sourceFile, program, host, preferences, packageJsonImportFilter, shouldGetModuleSpecifierFromCache)
+                    ? ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, symbolName, position, isValidTypeOnlyUseSite, sourceFile, program, host, preferences, packageJsonImportFilter, shouldGetModuleSpecifierFromCache)
                     : undefined;
                 if (!shouldResolveModuleSpecifier && !shouldGetModuleSpecifierFromCache || shouldGetModuleSpecifierFromCache && !result) {
                     resolutionLimitExceeded = true;
@@ -131238,8 +131246,8 @@ var ts;
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
             var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
-            var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, preferences, 
-            /*isForImportStatementCompletion*/ false, function (context) {
+            var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, location.getStart(), preferences, 
+            /*isForImportStatementCompletion*/ false, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
                     if (!entry.hasAction || !entry.source || !entry.data || completionEntryDataIsResolved(entry.data)) {
                         // Not an auto import or already resolved; keep as is
@@ -131251,7 +131259,7 @@ var ts;
                     }
                     var origin = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)).origin;
                     var info = exportMap.get(file.path, entry.data.exportMapKey);
-                    var result = info && context.tryResolve(info, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
+                    var result = info && context.tryResolve(info, entry.name, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
                     if (!result)
                         return entry;
                     var newOrigin = __assign(__assign({}, origin), { kind: 32 /* ResolvedExport */, moduleSpecifier: result.moduleSpecifier });
@@ -132787,7 +132795,7 @@ var ts;
                                     moduleSymbol: moduleSymbol,
                                     symbol: firstAccessibleSymbol,
                                     targetFlags: ts.skipAlias(firstAccessibleSymbol, typeChecker).flags,
-                                }], sourceFile, program, host, preferences) || {}).moduleSpecifier;
+                                }], firstAccessibleSymbol.name, position, ts.isValidTypeOnlyAliasUseSite(location), sourceFile, program, host, preferences) || {}).moduleSpecifier;
                             if (moduleSpecifier) {
                                 var origin = {
                                     kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
@@ -133042,7 +133050,7 @@ var ts;
                 var exportInfo = ts.getExportInfoMap(sourceFile, host, program, cancellationToken);
                 var packageJsonAutoImportProvider = (_b = host.getPackageJsonAutoImportProvider) === null || _b === void 0 ? void 0 : _b.call(host);
                 var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, preferences, host);
-                resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, preferences, !!importCompletionNode, function (context) {
+                resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, position, preferences, !!importCompletionNode, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
                     exportInfo.search(sourceFile.path, 
                     /*preferCapitalized*/ isRightOfOpenTag, function (symbolName, targetFlags) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
@@ -133070,7 +133078,7 @@ var ts;
                         }
                         // If we don't need to resolve module specifiers, we can use any re-export that is importable at all
                         // (We need to ensure that at least one is importable to show a completion.)
-                        var _a = context.tryResolve(info, isFromAmbientModule) || {}, _b = _a.exportInfo, exportInfo = _b === void 0 ? defaultExportInfo : _b, moduleSpecifier = _a.moduleSpecifier;
+                        var _a = context.tryResolve(info, symbolName, isFromAmbientModule) || {}, _b = _a.exportInfo, exportInfo = _b === void 0 ? defaultExportInfo : _b, moduleSpecifier = _a.moduleSpecifier;
                         var isDefaultExport = exportInfo.exportKind === 1 /* Default */;
                         var symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(exportInfo.symbol) || exportInfo.symbol;
                         pushAutoImportSymbol(symbol, {
@@ -151894,7 +151902,7 @@ var ts;
                 var symbol = checker.getMergedSymbol(ts.skipAlias(exportedSymbol, checker));
                 var exportInfo = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, /*isJsxTagName*/ false, host, program, preferences, useAutoImportProvider);
                 var useRequire = shouldUseRequire(sourceFile, program);
-                var fix = getImportFixForSymbol(sourceFile, exportInfo, moduleSymbol, symbolName, program, /*position*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
+                var fix = getImportFixForSymbol(sourceFile, exportInfo, moduleSymbol, program, /*useNamespaceInfo*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
                 if (fix) {
                     addImport({ fixes: [fix], symbolName: symbolName, errorIdentifierText: undefined });
                 }
@@ -152064,7 +152072,7 @@ var ts;
                 : getAllReExportingModules(sourceFile, targetSymbol, moduleSymbol, symbolName, isJsxTagName, host, program, preferences, /*useAutoImportProvider*/ true);
             var useRequire = shouldUseRequire(sourceFile, program);
             var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position));
-            var fix = ts.Debug.checkDefined(getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences));
+            var fix = ts.Debug.checkDefined(getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, program, { symbolName: symbolName, position: position }, isValidTypeOnlyUseSite, useRequire, host, preferences));
             return {
                 moduleSpecifier: fix.moduleSpecifier,
                 codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, 
@@ -152080,10 +152088,10 @@ var ts;
             return fix && codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, includeSymbolNameInDescription, 1 /* Double */, compilerOptions));
         }
         codefix.getPromoteTypeOnlyCompletionAction = getPromoteTypeOnlyCompletionAction;
-        function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
+        function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, program, useNamespaceInfo, isValidTypeOnlyUseSite, useRequire, host, preferences) {
             ts.Debug.assert(exportInfos.some(function (info) { return info.moduleSymbol === moduleSymbol || info.symbol.parent === moduleSymbol; }), "Some exportInfo should match the specified moduleSymbol");
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(sourceFile, preferences, host);
-            return getBestFix(getImportFixes(exportInfos, symbolName, position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences), sourceFile, program, packageJsonImportFilter, host);
+            return getBestFix(getImportFixes(exportInfos, useNamespaceInfo, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes, sourceFile, program, packageJsonImportFilter, host);
         }
         function codeFixActionToCodeAction(_a) {
             var description = _a.description, changes = _a.changes, commands = _a.commands;
@@ -152138,25 +152146,32 @@ var ts;
                 return !moduleFile || ts.isImportableFile(program, importingFile, moduleFile, preferences, /*packageJsonFilter*/ undefined, getModuleSpecifierResolutionHost(isFromPackageJson), (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host));
             }
         }
-        function getModuleSpecifierForBestExportInfo(exportInfo, importingFile, program, host, preferences, packageJsonImportFilter, fromCacheOnly) {
-            var _a = getNewImportFixes(program, importingFile, 
-            /*position*/ undefined, 
-            /*isValidTypeOnlyUseSite*/ false, 
-            /*useRequire*/ false, exportInfo, host, preferences, fromCacheOnly), fixes = _a.fixes, computedWithoutCacheCount = _a.computedWithoutCacheCount;
+        function getModuleSpecifierForBestExportInfo(exportInfo, symbolName, position, isValidTypeOnlyUseSite, importingFile, program, host, preferences, packageJsonImportFilter, fromCacheOnly) {
+            var _a = getImportFixes(exportInfo, { symbolName: symbolName, position: position }, isValidTypeOnlyUseSite, 
+            /*useRequire*/ false, program, importingFile, host, preferences, fromCacheOnly), fixes = _a.fixes, computedWithoutCacheCount = _a.computedWithoutCacheCount;
             var result = getBestFix(fixes, importingFile, program, packageJsonImportFilter || ts.createPackageJsonImportFilter(importingFile, preferences, host), host);
             return result && __assign(__assign({}, result), { computedWithoutCacheCount: computedWithoutCacheCount });
         }
         codefix.getModuleSpecifierForBestExportInfo = getModuleSpecifierForBestExportInfo;
-        function getImportFixes(exportInfos, symbolName, 
+        function getImportFixes(exportInfos, useNamespaceInfo, 
         /** undefined only for missing JSX namespace */
-        position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences) {
+        isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences, fromCacheOnly) {
             var checker = program.getTypeChecker();
             var existingImports = ts.flatMap(exportInfos, function (info) { return getExistingImportDeclarations(info, checker, sourceFile, program.getCompilerOptions()); });
-            var useNamespace = position === undefined ? undefined : tryUseExistingNamespaceImport(existingImports, symbolName, position, checker);
+            var useNamespace = useNamespaceInfo && tryUseExistingNamespaceImport(existingImports, useNamespaceInfo.symbolName, useNamespaceInfo.position, checker);
             var addToExisting = tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker, program.getCompilerOptions());
-            // Don't bother providing an action to add a new import if we can add to an existing one.
-            var addImport = addToExisting ? [addToExisting] : getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, host, preferences);
-            return __spreadArray(__spreadArray([], (useNamespace ? [useNamespace] : ts.emptyArray), true), addImport, true);
+            if (addToExisting) {
+                // Don't bother providing an action to add a new import if we can add to an existing one.
+                return {
+                    computedWithoutCacheCount: 0,
+                    fixes: __spreadArray(__spreadArray([], (useNamespace ? [useNamespace] : ts.emptyArray), true), [addToExisting], false),
+                };
+            }
+            var _a = getFixesForAddImport(exportInfos, existingImports, program, sourceFile, useNamespaceInfo === null || useNamespaceInfo === void 0 ? void 0 : useNamespaceInfo.position, isValidTypeOnlyUseSite, useRequire, host, preferences, fromCacheOnly), fixes = _a.fixes, _b = _a.computedWithoutCacheCount, computedWithoutCacheCount = _b === void 0 ? 0 : _b;
+            return {
+                computedWithoutCacheCount: computedWithoutCacheCount,
+                fixes: __spreadArray(__spreadArray([], (useNamespace ? [useNamespace] : ts.emptyArray), true), fixes, true),
+            };
         }
         function tryUseExistingNamespaceImport(existingImports, symbolName, position, checker) {
             // It is possible that multiple import statements with the same specifier exist in the file.
@@ -152346,9 +152361,9 @@ var ts;
             });
             return { computedWithoutCacheCount: computedWithoutCacheCount, fixes: fixes };
         }
-        function getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
+        function getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, host, preferences, fromCacheOnly) {
             var existingDeclaration = ts.firstDefined(existingImports, function (info) { return newImportInfoFromExistingSpecifier(info, isValidTypeOnlyUseSite, useRequire, program.getTypeChecker(), program.getCompilerOptions()); });
-            return existingDeclaration ? [existingDeclaration] : getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, exportInfos, host, preferences).fixes;
+            return existingDeclaration ? { fixes: [existingDeclaration] } : getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, exportInfos, host, preferences, fromCacheOnly);
         }
         function newImportInfoFromExistingSpecifier(_a, isValidTypeOnlyUseSite, useRequire, checker, compilerOptions) {
             var _b;
@@ -152444,7 +152459,8 @@ var ts;
             var symbolName = umdSymbol.name;
             var exportInfo = [{ symbol: umdSymbol, moduleSymbol: symbol, moduleFileName: undefined, exportKind: 3 /* UMD */, targetFlags: symbol.flags, isFromPackageJson: false }];
             var useRequire = shouldUseRequire(sourceFile, program);
-            var fixes = getImportFixes(exportInfo, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences);
+            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 };
         }
         function getUmdSymbol(token, checker) {
@@ -152516,7 +152532,7 @@ var ts;
             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, symbolToken.getStart(sourceFile), isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences);
+                return getImportFixes(exportInfos, { symbolName: symbolName, position: symbolToken.getStart(sourceFile) }, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes;
             }));
             return { fixes: fixes, symbolName: symbolName, errorIdentifierText: symbolToken.text };
         }