typescript 4.8.0-dev.20220616 → 4.8.0-dev.20220617

package/lib/tsserverlibrary.js

@@ -303,7 +303,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.20220616";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220617";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -9866,6 +9866,8 @@ var ts;
         Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, ts.DiagnosticCategory.Error, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
         A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, ts.DiagnosticCategory.Error, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."),
         The_tag_was_first_specified_here: diag(8034, ts.DiagnosticCategory.Error, "The_tag_was_first_specified_here_8034", "The tag was first specified here."),
+        You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder: diag(8035, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder_8035", "You cannot rename elements that are defined in a 'node_modules' folder."),
+        You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
         Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, ts.DiagnosticCategory.Error, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17000, ts.DiagnosticCategory.Error, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -49104,9 +49106,9 @@ var ts;
                 return moduleSpecifier && resolveExternalModuleName(moduleSpecifier, moduleSpecifier, /*ignoreErrors*/ true);
             },
             resolveExternalModuleSymbol: resolveExternalModuleSymbol,
-            tryGetThisTypeAt: function (nodeIn, includeGlobalThis) {
+            tryGetThisTypeAt: function (nodeIn, includeGlobalThis, container) {
                 var node = ts.getParseTreeNode(nodeIn);
-                return node && tryGetThisTypeAt(node, includeGlobalThis);
+                return node && tryGetThisTypeAt(node, includeGlobalThis, container);
             },
             getTypeArgumentConstraint: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
@@ -59554,7 +59556,7 @@ var ts;
                 }
                 if (t.flags & 268435456 /* StringMapping */) {
                     var constraint = getBaseConstraint(t.type);
-                    return constraint ? getStringMappingType(t.symbol, constraint) : stringType;
+                    return constraint && constraint !== t.type ? getStringMappingType(t.symbol, constraint) : stringType;
                 }
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     if (isMappedTypeGenericIndexedAccess(t)) {
@@ -62524,9 +62526,12 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
-                    type.flags & 128 /* StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                        type;
+                // Mapping<Mapping<T>> === Mapping<T>
+                type.flags & 268435456 /* StringMapping */ && symbol === type.symbol ? type :
+                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456 /* StringMapping */) ? getTemplateLiteralType(["", ""], [type]) : type) :
+                        type.flags & 128 /* StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                            type.flags & 134217728 /* TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                                type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -62537,6 +62542,15 @@ var ts;
             }
             return str;
         }
+        function applyTemplateStringMapping(symbol, texts, types) {
+            switch (intrinsicTypeKinds.get(symbol.escapedName)) {
+                case 0 /* Uppercase */: return [texts.map(function (t) { return t.toUpperCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 1 /* Lowercase */: return [texts.map(function (t) { return t.toLowerCase(); }), types.map(function (t) { return getStringMappingType(symbol, t); })];
+                case 2 /* Capitalize */: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toUpperCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+                case 3 /* Uncapitalize */: return [texts[0] === "" ? texts : __spreadArray([texts[0].charAt(0).toLowerCase() + texts[0].slice(1)], texts.slice(1), true), texts[0] === "" ? __spreadArray([getStringMappingType(symbol, types[0])], types.slice(1), true) : types];
+            }
+            return [texts, types];
+        }
         function getStringMappingTypeForGenericType(symbol, type) {
             var id = getSymbolId(symbol) + "," + getTypeId(type);
             var result = stringMappingTypes.get(id);
@@ -62778,7 +62792,7 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */));
+            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) || !!(type.flags & 268435456 /* StringMapping */ && isPatternLiteralPlaceholderType(type.type));
         }
         function isPatternLiteralType(type) {
             return !!(type.flags & 134217728 /* TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
@@ -66490,6 +66504,13 @@ var ts;
                         return -1 /* True */;
                     }
                 }
+                else if (target.flags & 268435456 /* StringMapping */) {
+                    if (!(source.flags & 268435456 /* StringMapping */)) {
+                        if (isMemberOfStringMapping(source, target)) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
                 if (sourceFlags & 8650752 /* TypeVariable */) {
                     // IndexedAccess comparisons are handled above in the `targetFlags & TypeFlage.IndexedAccess` branch
                     if (!(sourceFlags & 8388608 /* IndexedAccess */ && targetFlags & 8388608 /* IndexedAccess */)) {
@@ -66533,7 +66554,10 @@ var ts;
                     }
                 }
                 else if (sourceFlags & 268435456 /* StringMapping */) {
-                    if (targetFlags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                    if (targetFlags & 268435456 /* StringMapping */) {
+                        if (source.symbol !== target.symbol) {
+                            return 0 /* False */;
+                        }
                         if (result = isRelatedTo(source.type, target.type, 3 /* Both */, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -67458,7 +67482,7 @@ var ts;
                     return typeCouldHaveTopLevelSingletonTypes(constraint);
                 }
             }
-            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */);
+            return isUnitType(type) || !!(type.flags & 134217728 /* TemplateLiteral */) || !!(type.flags & 268435456 /* StringMapping */);
         }
         function getExactOptionalUnassignableProperties(source, target) {
             if (isTupleType(source) && isTupleType(target))
@@ -68929,6 +68953,31 @@ var ts;
             return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === (s.length + 1) && !(flags & 512 /* ContainsSeparator */)
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
+        function isMemberOfStringMapping(source, target) {
+            if (target.flags & (4 /* String */ | 3 /* AnyOrUnknown */)) {
+                return true;
+            }
+            if (target.flags & 134217728 /* TemplateLiteral */) {
+                return isTypeAssignableTo(source, target);
+            }
+            if (target.flags & 268435456 /* StringMapping */) {
+                // We need to see whether applying the same mappings of the target
+                // onto the source would produce an identical type *and* that
+                // it's compatible with the inner-most non-string-mapped type.
+                //
+                // The intuition here is that if same mappings don't affect the source at all,
+                // and the source is compatible with the unmapped target, then they must
+                // still reside in the same domain.
+                var mappingStack = [];
+                while (target.flags & 268435456 /* StringMapping */) {
+                    mappingStack.unshift(target.symbol);
+                    target = target.type;
+                }
+                var mappedSource = ts.reduceLeft(mappingStack, function (memo, value) { return getStringMappingType(value, memo); }, source);
+                return mappedSource === source && isMemberOfStringMapping(source, target);
+            }
+            return false;
+        }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
                 return true;
@@ -68937,7 +68986,8 @@ var ts;
                 var value = source.value;
                 return !!(target.flags & 8 /* Number */ && isValidNumberString(value, /*roundTripOnly*/ false) ||
                     target.flags & 64 /* BigInt */ && isValidBigIntString(value, /*roundTripOnly*/ false) ||
-                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName);
+                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName ||
+                    target.flags & 268435456 /* StringMapping */ && isMemberOfStringMapping(getStringLiteralType(value), target));
             }
             if (source.flags & 134217728 /* TemplateLiteral */) {
                 var texts = source.texts;
@@ -135395,7 +135445,7 @@ var ts;
                 }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
                 if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 305 /* SourceFile */) {
-                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
+                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false, ts.isClassLike(scopeNode.parent) ? scopeNode : undefined);
                     if (thisType && !isProbablyGlobalType(thisType, sourceFile, typeChecker)) {
                         for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
                             var symbol = _a[_i];
@@ -144733,10 +144783,10 @@ var ts;
 (function (ts) {
     var Rename;
     (function (Rename) {
-        function getRenameInfo(program, sourceFile, position, options) {
+        function getRenameInfo(program, sourceFile, position, preferences) {
             var node = ts.getAdjustedRenameLocation(ts.getTouchingPropertyName(sourceFile, position));
             if (nodeIsEligibleForRename(node)) {
-                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, options);
+                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, preferences);
                 if (renameInfo) {
                     return renameInfo;
                 }
@@ -144744,7 +144794,7 @@ var ts;
             return getRenameInfoError(ts.Diagnostics.You_cannot_rename_this_element);
         }
         Rename.getRenameInfo = getRenameInfo;
-        function getRenameInfoForNode(node, typeChecker, sourceFile, program, options) {
+        function getRenameInfoForNode(node, typeChecker, sourceFile, program, preferences) {
             var symbol = typeChecker.getSymbolAtLocation(node);
             if (!symbol) {
                 if (ts.isStringLiteralLike(node)) {
@@ -144772,7 +144822,12 @@ var ts;
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
-                return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+                return preferences.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+            }
+            // Disallow rename for elements that would rename across `*/node_modules/*` packages.
+            var wouldRenameNodeModules = wouldRenameInOtherNodeModules(sourceFile, symbol, typeChecker, preferences);
+            if (wouldRenameNodeModules) {
+                return getRenameInfoError(wouldRenameNodeModules);
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
             var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 162 /* ComputedPropertyName */)
@@ -144786,6 +144841,49 @@ var ts;
             var sourceFile = declaration.getSourceFile();
             return program.isSourceFileDefaultLibrary(sourceFile) && ts.fileExtensionIs(sourceFile.fileName, ".d.ts" /* Dts */);
         }
+        function wouldRenameInOtherNodeModules(originalFile, symbol, checker, preferences) {
+            if (!preferences.providePrefixAndSuffixTextForRename && symbol.flags & 2097152 /* Alias */) {
+                var importSpecifier = symbol.declarations && ts.find(symbol.declarations, function (decl) { return ts.isImportSpecifier(decl); });
+                if (importSpecifier && !importSpecifier.propertyName) {
+                    symbol = checker.getAliasedSymbol(symbol);
+                }
+            }
+            var declarations = symbol.declarations;
+            if (!declarations) {
+                return undefined;
+            }
+            var originalPackage = getPackagePathComponents(originalFile.path);
+            if (originalPackage === undefined) { // original source file is not in node_modules
+                if (ts.some(declarations, function (declaration) { return ts.isInsideNodeModules(declaration.getSourceFile().path); })) {
+                    return ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder;
+                }
+                else {
+                    return undefined;
+                }
+            }
+            // original source file is in node_modules
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var declaration = declarations_4[_i];
+                var declPackage = getPackagePathComponents(declaration.getSourceFile().path);
+                if (declPackage) {
+                    var length_2 = Math.min(originalPackage.length, declPackage.length);
+                    for (var i = 0; i <= length_2; i++) {
+                        if (ts.compareStringsCaseSensitive(originalPackage[i], declPackage[i]) !== 0 /* EqualTo */) {
+                            return ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function getPackagePathComponents(filePath) {
+            var components = ts.getPathComponents(filePath);
+            var nodeModulesIdx = components.lastIndexOf("node_modules");
+            if (nodeModulesIdx === -1) {
+                return undefined;
+            }
+            return components.slice(0, nodeModulesIdx + 2);
+        }
         function getRenameInfoForModule(node, sourceFile, moduleSymbol) {
             if (!ts.isExternalModuleNameRelative(node.text)) {
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_a_module_via_a_global_import);
@@ -161825,11 +161923,11 @@ var ts;
                         }
                     }
                     else if (ts.isVariableStatement(node) || ts.isVariableDeclarationList(node)) {
-                        var declarations_5 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
+                        var declarations_6 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
                         var numInitializers = 0;
                         var lastInitializer = void 0;
-                        for (var _i = 0, declarations_4 = declarations_5; _i < declarations_4.length; _i++) {
-                            var declaration = declarations_4[_i];
+                        for (var _i = 0, declarations_5 = declarations_6; _i < declarations_5.length; _i++) {
+                            var declaration = declarations_5[_i];
                             if (declaration.initializer) {
                                 numInitializers++;
                                 lastInitializer = declaration.initializer;
@@ -165966,8 +166064,8 @@ var ts;
                     tags = __spreadArray(__spreadArray([], inheritedTags, true), tags, true);
                 }
             };
-            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                var declaration = declarations_6[_i];
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
                 _loop_21(declaration);
             }
         }
@@ -165993,8 +166091,8 @@ var ts;
                 if (inheritedDocs)
                     doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
             };
-            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
-                var declaration = declarations_7[_i];
+            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                var declaration = declarations_8[_i];
                 _loop_22(declaration);
             }
         }
@@ -167571,9 +167669,9 @@ var ts;
                 return ts.stringContains(path, "/node_modules/");
             }
         }
-        function getRenameInfo(fileName, position, options) {
+        function getRenameInfo(fileName, position, preferences) {
             synchronizeHostData();
-            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, options);
+            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, preferences || {});
         }
         function getRefactorContext(file, positionOrRange, preferences, formatOptions, triggerReason, kind) {
             var _a = typeof positionOrRange === "number" ? [positionOrRange, undefined] : [positionOrRange.pos, positionOrRange.end], startPosition = _a[0], endPosition = _a[1];
@@ -168939,9 +169037,9 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
         };
-        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, options) {
+        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, preferences) {
             var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
+            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, preferences); });
         };
         LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
             var _this = this;
@@ -176692,7 +176790,7 @@ var ts;
             return info && !info.isLocal ? { fileName: info.fileName, pos: info.textSpan.start } : undefined;
         }
         function getReferencesWorker(projects, defaultProject, initialLocation, logger) {
-            var _a;
+            var _a, _b;
             var perProjectResults = getPerProjectReferences(projects, defaultProject, initialLocation, 
             /*isForRename*/ false, function (project, position) {
                 logger.info("Finding references to " + position.fileName + " position " + position.pos + " in project " + project.getProjectName());
@@ -176712,7 +176810,7 @@ var ts;
             // have started the other project searches from related symbols.  Propagate the
             // correct results to all other projects.
             var defaultProjectResults = perProjectResults.get(defaultProject);
-            if (((_a = defaultProjectResults === null || defaultProjectResults === void 0 ? void 0 : defaultProjectResults[0].references[0]) === null || _a === void 0 ? void 0 : _a.isDefinition) === undefined) {
+            if (((_b = (_a = defaultProjectResults === null || defaultProjectResults === void 0 ? void 0 : defaultProjectResults[0]) === null || _a === void 0 ? void 0 : _a.references[0]) === null || _b === void 0 ? void 0 : _b.isDefinition) === undefined) {
                 // Clear all isDefinition properties
                 perProjectResults.forEach(function (projectResults) {
                     for (var _i = 0, projectResults_2 = projectResults; _i < projectResults_2.length; _i++) {
@@ -176729,8 +176827,8 @@ var ts;
                 var knownSymbolSpans_1 = createDocumentSpanSet();
                 for (var _i = 0, defaultProjectResults_1 = defaultProjectResults; _i < defaultProjectResults_1.length; _i++) {
                     var referencedSymbol = defaultProjectResults_1[_i];
-                    for (var _b = 0, _c = referencedSymbol.references; _b < _c.length; _b++) {
-                        var ref = _c[_b];
+                    for (var _c = 0, _d = referencedSymbol.references; _c < _d.length; _c++) {
+                        var ref = _d[_c];
                         if (ref.isDefinition) {
                             knownSymbolSpans_1.add(ref);
                             // One is enough - updateIsDefinitionOfReferencedSymbols will fill out the set based on symbols
@@ -176849,23 +176947,30 @@ var ts;
             var getSourceDefinition = ts.memoize(function () { return defaultProject.isSourceOfProjectReferenceRedirect(defaultDefinition.fileName) ?
                 defaultDefinition :
                 defaultProject.getLanguageService().getSourceMapper().tryGetSourcePosition(defaultDefinition); });
-            // Track which projects we have already searched so that we don't repeat searches.
-            // We store the project key, rather than the project, because that's what `loadAncestorProjectTree` wants.
-            // (For that same reason, we don't use `resultsMap` for this check.)
-            var searchedProjects = new ts.Set();
+            // The keys of resultsMap allow us to check which projects have already been searched, but we also
+            // maintain a set of strings because that's what `loadAncestorProjectTree` wants.
+            var searchedProjectKeys = new ts.Set();
             onCancellation: while (queue.length) {
                 while (queue.length) {
                     if (cancellationToken.isCancellationRequested())
                         break onCancellation;
+                    var skipCount = 0;
+                    for (; skipCount < queue.length && resultsMap.has(queue[skipCount].project); skipCount++)
+                        ;
+                    if (skipCount === queue.length) {
+                        queue.length = 0;
+                        break;
+                    }
+                    if (skipCount > 0) {
+                        queue.splice(0, skipCount);
+                    }
+                    // NB: we may still skip if it's a project reference redirect
                     var _a = queue.shift(), project = _a.project, location = _a.location;
                     if (isLocationProjectReferenceRedirect(project, location))
                         continue;
-                    if (!ts.tryAddToSet(searchedProjects, getProjectKey(project)))
-                        continue;
                     var projectResults = searchPosition(project, location);
-                    if (projectResults) {
-                        resultsMap.set(project, projectResults);
-                    }
+                    resultsMap.set(project, projectResults !== null && projectResults !== void 0 ? projectResults : server.emptyArray);
+                    searchedProjectKeys.add(getProjectKey(project));
                 }
                 // At this point, we know about all projects passed in as arguments and any projects in which
                 // `getResultsForPosition` has returned results.  We expand that set to include any projects
@@ -176873,11 +176978,11 @@ var ts;
                 // containing `initialLocation`.
                 if (defaultDefinition) {
                     // This seems to mean "load all projects downstream from any member of `seenProjects`".
-                    projectService.loadAncestorProjectTree(searchedProjects);
+                    projectService.loadAncestorProjectTree(searchedProjectKeys);
                     projectService.forEachEnabledProject(function (project) {
                         if (cancellationToken.isCancellationRequested())
                             return; // There's no mechanism for skipping the remaining projects
-                        if (searchedProjects.has(getProjectKey(project)))
+                        if (resultsMap.has(project))
                             return; // Can loop forever without this (enqueue here, dequeue above, repeat)
                         var location = mapDefinitionInProject(defaultDefinition, project, getGeneratedDefinition, getSourceDefinition);
                         if (location) {
@@ -176888,9 +176993,10 @@ var ts;
             }
             // In the common case where there's only one project, return a simpler result to make
             // it easier for the caller to skip post-processing.
-            if (searchedProjects.size === 1) {
+            if (resultsMap.size === 1) {
                 var it = resultsMap.values().next();
-                return it.done ? server.emptyArray : it.value; // There may not be any results at all
+                ts.Debug.assert(!it.done);
+                return it.value;
             }
             return resultsMap;
             function searchPosition(project, location) {
@@ -176907,7 +177013,7 @@ var ts;
                         var originalScriptInfo = projectService.getScriptInfo(originalLocation.fileName);
                         for (var _i = 0, _a = originalScriptInfo.containingProjects; _i < _a.length; _i++) {
                             var project_1 = _a[_i];
-                            if (!project_1.isOrphan()) {
+                            if (!project_1.isOrphan() && !resultsMap.has(project_1)) { // Optimization: don't enqueue if will be discarded
                                 queue.push({ project: project_1, location: originalLocation });
                             }
                         }
@@ -176916,7 +177022,7 @@ var ts;
                             symlinkedProjectsMap.forEach(function (symlinkedProjects, symlinkedPath) {
                                 for (var _i = 0, symlinkedProjects_2 = symlinkedProjects; _i < symlinkedProjects_2.length; _i++) {
                                     var symlinkedProject = symlinkedProjects_2[_i];
-                                    if (!symlinkedProject.isOrphan()) {
+                                    if (!symlinkedProject.isOrphan() && !resultsMap.has(symlinkedProject)) { // Optimization: don't enqueue if will be discarded
                                         queue.push({ project: symlinkedProject, location: { fileName: symlinkedPath, pos: originalLocation.pos } });
                                     }
                                 }
@@ -178209,7 +178315,8 @@ var ts;
             Session.prototype.getRenameInfo = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
-                return project.getLanguageService().getRenameInfo(file, position, { allowRenameOfImportPath: this.getPreferences(file).allowRenameOfImportPath });
+                var preferences = this.getPreferences(file);
+                return project.getLanguageService().getRenameInfo(file, position, preferences);
             };
             Session.prototype.getProjects = function (args, getScriptInfoEnsuringProjectsUptoDate, ignoreNoProjectError) {
                 var _a;
@@ -178260,10 +178367,11 @@ var ts;
                 var position = this.getPositionInFile(args, file);
                 var projects = this.getProjects(args);
                 var defaultProject = this.getDefaultProject(args);
-                var renameInfo = this.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position, { allowRenameOfImportPath: this.getPreferences(file).allowRenameOfImportPath }), ts.Debug.checkDefined(this.projectService.getScriptInfo(file)));
+                var preferences = this.getPreferences(file);
+                var renameInfo = this.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position, preferences), ts.Debug.checkDefined(this.projectService.getScriptInfo(file)));
                 if (!renameInfo.canRename)
                     return simplifiedResult ? { info: renameInfo, locs: [] } : [];
-                var locations = getRenameLocationsWorker(projects, defaultProject, { fileName: args.file, pos: position }, !!args.findInStrings, !!args.findInComments, this.getPreferences(file));
+                var locations = getRenameLocationsWorker(projects, defaultProject, { fileName: args.file, pos: position }, !!args.findInStrings, !!args.findInComments, preferences);
                 if (!simplifiedResult)
                     return locations;
                 return { info: renameInfo, locs: this.toSpanGroups(locations) };

package/lib/typescript.d.ts

@@ -4137,6 +4137,7 @@ declare namespace ts {
         readonly includeInlayPropertyDeclarationTypeHints?: boolean;
         readonly includeInlayFunctionLikeReturnTypeHints?: boolean;
         readonly includeInlayEnumMemberValueHints?: boolean;
+        readonly allowRenameOfImportPath?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */
     export interface PseudoBigInt {
@@ -5917,6 +5918,8 @@ declare namespace ts {
         getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan | undefined;
         getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan | undefined;
         getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined;
+        getRenameInfo(fileName: string, position: number, preferences: UserPreferences): RenameInfo;
+        /** @deprecated Use the signature with `UserPreferences` instead. */
         getRenameInfo(fileName: string, position: number, options?: RenameInfoOptions): RenameInfo;
         findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean): readonly RenameLocation[] | undefined;
         getSmartSelectionRange(fileName: string, position: number): SelectionRange;
@@ -6296,6 +6299,7 @@ declare namespace ts {
         Insert = "insert",
         Remove = "remove"
     }
+    /** @deprecated - consider using EditorSettings instead */
     interface EditorOptions {
         BaseIndentSize?: number;
         IndentSize: number;
@@ -6313,6 +6317,7 @@ declare namespace ts {
         indentStyle?: IndentStyle;
         trimTrailingWhitespace?: boolean;
     }
+    /** @deprecated - consider using FormatCodeSettings instead */
     interface FormatCodeOptions extends EditorOptions {
         InsertSpaceAfterCommaDelimiter: boolean;
         InsertSpaceAfterSemicolonInForStatements: boolean;
@@ -6438,6 +6443,9 @@ declare namespace ts {
         canRename: false;
         localizedErrorMessage: string;
     }
+    /**
+     * @deprecated Use `UserPreferences` instead.
+     */
     interface RenameInfoOptions {
         readonly allowRenameOfImportPath?: boolean;
     }