typescript 4.7.0-dev.20220307 → 4.7.0-dev.20220308

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220307";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220308";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -11330,7 +11330,7 @@ var ts;
         return name.kind === 161 && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
-    function getTextOfPropertyName(name) {
+    function tryGetTextOfPropertyName(name) {
         switch (name.kind) {
             case 79:
             case 80:
@@ -11342,11 +11342,15 @@ var ts;
             case 161:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
-                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+                return undefined;
             default:
                 return ts.Debug.assertNever(name);
         }
     }
+    ts.tryGetTextOfPropertyName = tryGetTextOfPropertyName;
+    function getTextOfPropertyName(name) {
+        return ts.Debug.checkDefined(tryGetTextOfPropertyName(name));
+    }
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
@@ -11863,7 +11867,7 @@ var ts;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
             if (property.kind === 295) {
-                var propName = getTextOfPropertyName(property.name);
+                var propName = tryGetTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
             return false;

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.20220307";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220308";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -14833,7 +14833,7 @@ var ts;
         return name.kind === 161 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
-    function getTextOfPropertyName(name) {
+    function tryGetTextOfPropertyName(name) {
         switch (name.kind) {
             case 79 /* Identifier */:
             case 80 /* PrivateIdentifier */:
@@ -14845,11 +14845,15 @@ var ts;
             case 161 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
-                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+                return undefined;
             default:
                 return ts.Debug.assertNever(name);
         }
     }
+    ts.tryGetTextOfPropertyName = tryGetTextOfPropertyName;
+    function getTextOfPropertyName(name) {
+        return ts.Debug.checkDefined(tryGetTextOfPropertyName(name));
+    }
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
@@ -15401,7 +15405,7 @@ var ts;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
             if (property.kind === 295 /* PropertyAssignment */) {
-                var propName = getTextOfPropertyName(property.name);
+                var propName = tryGetTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
             return false;
@@ -172425,47 +172429,18 @@ var ts;
             }
             return ts.deduplicate(outputs, ts.equateValues);
         }
-        function combineOutputResultContains(outputs, output, areEqual) {
-            return outputs.some(function (_a) {
-                var result = _a.result;
-                return ts.contains(result, output, areEqual);
-            });
-        }
-        function addToCombineOutputResult(outputs, project, result) {
-            if (result.length)
-                outputs.push({ project: project, result: result });
-        }
-        function combineProjectOutputFromEveryProject(projectService, action, areEqual) {
-            var outputs = [];
-            projectService.loadAncestorProjectTree();
-            projectService.forEachEnabledProject(function (project) {
-                var theseOutputs = action(project);
-                addToCombineOutputResult(outputs, project, ts.filter(theseOutputs, function (output) { return !combineOutputResultContains(outputs, output, areEqual); }));
-            });
-            return outputs;
-        }
-        function flattenCombineOutputResult(outputs) {
-            return ts.flatMap(outputs, function (_a) {
-                var result = _a.result;
-                return result;
-            });
-        }
-        function combineProjectOutputWhileOpeningReferencedProjects(projects, defaultProject, action, getLocation, resultsEqual) {
-            var outputs = [];
-            combineProjectOutputWorker(projects, defaultProject, 
-            /*initialLocation*/ undefined, function (project, _, tryAddToTodo) {
-                var theseOutputs = action(project);
-                addToCombineOutputResult(outputs, project, ts.filter(theseOutputs, function (output) { return !combineOutputResultContains(outputs, output, resultsEqual) && !tryAddToTodo(project, getLocation(output)); }));
-            });
-            return outputs;
-        }
-        function combineProjectOutputForRenameLocations(projects, defaultProject, initialLocation, findInStrings, findInComments, hostPreferences) {
+        ;
+        function combineProjectOutputForRenameLocations(projects, defaultProject, initialLocation, findInStrings, findInComments, _a) {
+            var providePrefixAndSuffixTextForRename = _a.providePrefixAndSuffixTextForRename;
             var outputs = [];
             combineProjectOutputWorker(projects, defaultProject, initialLocation, function (project, location, tryAddToTodo) {
-                for (var _i = 0, _a = project.getLanguageService().findRenameLocations(location.fileName, location.pos, findInStrings, findInComments, hostPreferences.providePrefixAndSuffixTextForRename) || server.emptyArray; _i < _a.length; _i++) {
-                    var output = _a[_i];
-                    if (!ts.contains(outputs, output, ts.documentSpansEqual) && !tryAddToTodo(project, documentSpanLocation(output))) {
-                        outputs.push(output);
+                var projectOutputs = project.getLanguageService().findRenameLocations(location.fileName, location.pos, findInStrings, findInComments, providePrefixAndSuffixTextForRename);
+                if (projectOutputs) {
+                    for (var _i = 0, projectOutputs_1 = projectOutputs; _i < projectOutputs_1.length; _i++) {
+                        var output = projectOutputs_1[_i];
+                        if (!ts.contains(outputs, output, ts.documentSpansEqual) && !tryAddToTodo(project, documentSpanLocation(output))) {
+                            outputs.push(output);
+                        }
                     }
                 }
             });
@@ -172480,43 +172455,33 @@ var ts;
             var outputs = [];
             combineProjectOutputWorker(projects, defaultProject, initialLocation, function (project, location, getMappedLocation) {
                 logger.info("Finding references to " + location.fileName + " position " + location.pos + " in project " + project.getProjectName());
-                var _loop_8 = function (outputReferencedSymbol) {
-                    var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(outputReferencedSymbol.definition));
-                    var definition = mappedDefinitionFile === undefined ?
-                        outputReferencedSymbol.definition : __assign(__assign({}, outputReferencedSymbol.definition), { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, outputReferencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(outputReferencedSymbol.definition, project) });
-                    var symbolToAddTo = ts.find(outputs, function (o) { return ts.documentSpansEqual(o.definition, definition); });
-                    if (!symbolToAddTo) {
-                        symbolToAddTo = { definition: definition, references: [] };
-                        outputs.push(symbolToAddTo);
-                    }
-                    for (var _b = 0, _c = outputReferencedSymbol.references; _b < _c.length; _b++) {
-                        var ref = _c[_b];
-                        // If it's in a mapped file, that is added to the todo list by `getMappedLocation`.
-                        if (!ts.contains(symbolToAddTo.references, ref, ts.documentSpansEqual) && !getMappedLocation(project, documentSpanLocation(ref))) {
-                            symbolToAddTo.references.push(ref);
+                var projectOutputs = project.getLanguageService().findReferences(location.fileName, location.pos);
+                if (projectOutputs) {
+                    var _loop_8 = function (referencedSymbol) {
+                        var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(referencedSymbol.definition));
+                        var definition = mappedDefinitionFile === undefined ?
+                            referencedSymbol.definition : __assign(__assign({}, referencedSymbol.definition), { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, referencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(referencedSymbol.definition, project) });
+                        var symbolToAddTo = ts.find(outputs, function (o) { return ts.documentSpansEqual(o.definition, definition); });
+                        if (!symbolToAddTo) {
+                            symbolToAddTo = { definition: definition, references: [] };
+                            outputs.push(symbolToAddTo);
+                        }
+                        for (var _a = 0, _b = referencedSymbol.references; _a < _b.length; _a++) {
+                            var ref = _b[_a];
+                            // If it's in a mapped file, that is added to the todo list by `getMappedLocation`.
+                            if (!ts.contains(symbolToAddTo.references, ref, ts.documentSpansEqual) && !getMappedLocation(project, documentSpanLocation(ref))) {
+                                symbolToAddTo.references.push(ref);
+                            }
                         }
+                    };
+                    for (var _i = 0, projectOutputs_2 = projectOutputs; _i < projectOutputs_2.length; _i++) {
+                        var referencedSymbol = projectOutputs_2[_i];
+                        _loop_8(referencedSymbol);
                     }
-                };
-                for (var _i = 0, _a = project.getLanguageService().findReferences(location.fileName, location.pos) || server.emptyArray; _i < _a.length; _i++) {
-                    var outputReferencedSymbol = _a[_i];
-                    _loop_8(outputReferencedSymbol);
                 }
             });
             return outputs.filter(function (o) { return o.references.length !== 0; });
         }
-        function combineProjectOutputForFileReferences(projects, defaultProject, fileName) {
-            var outputs = [];
-            combineProjectOutputWorker(projects, defaultProject, 
-            /*initialLocation*/ undefined, function (project) {
-                for (var _i = 0, _a = project.getLanguageService().getFileReferences(fileName) || server.emptyArray; _i < _a.length; _i++) {
-                    var referenceEntry = _a[_i];
-                    if (!ts.contains(outputs, referenceEntry, ts.documentSpansEqual)) {
-                        outputs.push(referenceEntry);
-                    }
-                }
-            });
-            return outputs;
-        }
         function forEachProjectInProjects(projects, path, cb) {
             for (var _i = 0, _a = ts.isArray(projects) ? projects : projects.projects; _i < _a.length; _i++) {
                 var project = _a[_i];
@@ -173855,7 +173820,21 @@ var ts;
             Session.prototype.getFileReferences = function (args, simplifiedResult) {
                 var _this = this;
                 var projects = this.getProjects(args);
-                var references = combineProjectOutputForFileReferences(projects, this.getDefaultProject(args), args.file);
+                var fileName = args.file;
+                var references = [];
+                forEachProjectInProjects(projects, /*path*/ undefined, function (project) {
+                    if (project.getCancellationToken().isCancellationRequested())
+                        return;
+                    var projectOutputs = project.getLanguageService().getFileReferences(fileName);
+                    if (projectOutputs) {
+                        for (var _i = 0, projectOutputs_3 = projectOutputs; _i < projectOutputs_3.length; _i++) {
+                            var referenceEntry = projectOutputs_3[_i];
+                            if (!ts.contains(references, referenceEntry, ts.documentSpansEqual)) {
+                                references.push(referenceEntry);
+                            }
+                        }
+                    }
+                });
                 if (!simplifiedResult)
                     return references;
                 var refs = references.map(function (entry) { return referenceEntryToReferencesResponseItem(_this.projectService, entry); });
@@ -174254,10 +174233,13 @@ var ts;
             Session.prototype.getNavigateToItems = function (args, simplifiedResult) {
                 var full = this.getFullNavigateToItems(args);
                 return !simplifiedResult ?
-                    flattenCombineOutputResult(full) :
                     ts.flatMap(full, function (_a) {
-                        var project = _a.project, result = _a.result;
-                        return result.map(function (navItem) {
+                        var navigateToItems = _a.navigateToItems;
+                        return navigateToItems;
+                    }) :
+                    ts.flatMap(full, function (_a) {
+                        var project = _a.project, navigateToItems = _a.navigateToItems;
+                        return navigateToItems.map(function (navItem) {
                             var scriptInfo = project.getScriptInfo(navItem.fileName);
                             var bakedItem = {
                                 name: navItem.name,
@@ -174287,13 +174269,57 @@ var ts;
                 if (currentFileOnly) {
                     ts.Debug.assertIsDefined(args.file);
                     var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                    return [{ project: project, result: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
+                    return [{ project: project, navigateToItems: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
+                }
+                var outputs = [];
+                // This is effectively a hashset with `name` as the custom hash and `navigateToItemIsEqualTo` as the custom equals.
+                // `name` is a very cheap hash function, but we could incorporate other properties to reduce collisions.
+                var seenItems = new ts.Map(); // name to items with that name
+                if (!args.file && !projectFileName) {
+                    // VS Code's `Go to symbol in workspaces` sends request like this
+                    // TODO (https://github.com/microsoft/TypeScript/issues/47839)
+                    // This appears to have been intended to search all projects but, in practice, it seems to only search
+                    // those that are downstream from already-loaded projects.
+                    // Filtering by !isSourceOfProjectReferenceRedirect is new, but seems appropriate and consistent with
+                    // the case below.
+                    this.projectService.loadAncestorProjectTree();
+                    this.projectService.forEachEnabledProject(function (project) { return addItemsForProject(project); });
                 }
-                else if (!args.file && !projectFileName) {
-                    return combineProjectOutputFromEveryProject(this.projectService, function (project) { return project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, /*filename*/ undefined, /*excludeDts*/ project.isNonTsProject()); }, navigateToItemIsEqualTo);
+                else {
+                    // VS's `Go to symbol` sends requests with just a project and doesn't want cascading since it will
+                    // send a separate request for each project of interest
+                    // TODO (https://github.com/microsoft/TypeScript/issues/47839)
+                    // This doesn't really make sense unless it's a single project matching `projectFileName`
+                    var projects = this.getProjects(args);
+                    forEachProjectInProjects(projects, /*path*/ undefined, function (project) { return addItemsForProject(project); });
+                }
+                return outputs;
+                // Mutates `outputs`
+                function addItemsForProject(project) {
+                    var projectItems = project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, /*filename*/ undefined, /*excludeDts*/ project.isNonTsProject());
+                    var unseenItems = ts.filter(projectItems, function (item) { return tryAddSeenItem(item) && !getMappedLocation(documentSpanLocation(item), project); });
+                    if (unseenItems.length) {
+                        outputs.push({ project: project, navigateToItems: unseenItems });
+                    }
+                }
+                // Returns true if the item had not been seen before
+                // Mutates `seenItems`
+                function tryAddSeenItem(item) {
+                    var name = item.name;
+                    if (!seenItems.has(name)) {
+                        seenItems.set(name, [item]);
+                        return true;
+                    }
+                    var seen = seenItems.get(name);
+                    for (var _i = 0, seen_1 = seen; _i < seen_1.length; _i++) {
+                        var seenItem = seen_1[_i];
+                        if (navigateToItemIsEqualTo(seenItem, item)) {
+                            return false;
+                        }
+                    }
+                    seen.push(item);
+                    return true;
                 }
-                var fileArgs = args;
-                return combineProjectOutputWhileOpeningReferencedProjects(this.getProjects(fileArgs), this.getDefaultProject(fileArgs), function (project) { return project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, /*fileName*/ undefined, /*excludeDts*/ project.isNonTsProject()); }, documentSpanLocation, navigateToItemIsEqualTo);
                 function navigateToItemIsEqualTo(a, b) {
                     if (a === b) {
                         return true;
@@ -174385,8 +174411,28 @@ var ts;
                 var newPath = server.toNormalizedPath(args.newFilePath);
                 var formatOptions = this.getHostFormatOptions();
                 var preferences = this.getHostPreferences();
-                var changes = flattenCombineOutputResult(combineProjectOutputFromEveryProject(this.projectService, function (project) { return project.getLanguageService().getEditsForFileRename(oldPath, newPath, formatOptions, preferences); }, function (a, b) { return a.fileName === b.fileName; }));
-                return simplifiedResult ? changes.map(function (c) { return _this.mapTextChangeToCodeEdit(c); }) : changes;
+                var seenFiles = new ts.Set();
+                var textChanges = [];
+                // TODO (https://github.com/microsoft/TypeScript/issues/47839)
+                // This appears to have been intended to search all projects but, in practice, it seems to only search
+                // those that are downstream from already-loaded projects.
+                this.projectService.loadAncestorProjectTree();
+                this.projectService.forEachEnabledProject(function (project) {
+                    var projectTextChanges = project.getLanguageService().getEditsForFileRename(oldPath, newPath, formatOptions, preferences);
+                    var projectFiles = [];
+                    for (var _i = 0, projectTextChanges_1 = projectTextChanges; _i < projectTextChanges_1.length; _i++) {
+                        var textChange = projectTextChanges_1[_i];
+                        if (!seenFiles.has(textChange.fileName)) {
+                            textChanges.push(textChange);
+                            projectFiles.push(textChange.fileName);
+                        }
+                    }
+                    for (var _a = 0, projectFiles_1 = projectFiles; _a < projectFiles_1.length; _a++) {
+                        var file = projectFiles_1[_a];
+                        seenFiles.add(file);
+                    }
+                });
+                return simplifiedResult ? textChanges.map(function (c) { return _this.mapTextChangeToCodeEdit(c); }) : textChanges;
             };
             Session.prototype.getCodeFixes = function (args, simplifiedResult) {
                 var _this = this;

package/lib/tsserverlibrary.js

@@ -294,7 +294,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.20220307";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220308";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -15027,7 +15027,7 @@ var ts;
         return name.kind === 161 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
-    function getTextOfPropertyName(name) {
+    function tryGetTextOfPropertyName(name) {
         switch (name.kind) {
             case 79 /* Identifier */:
             case 80 /* PrivateIdentifier */:
@@ -15039,11 +15039,15 @@ var ts;
             case 161 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
-                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+                return undefined;
             default:
                 return ts.Debug.assertNever(name);
         }
     }
+    ts.tryGetTextOfPropertyName = tryGetTextOfPropertyName;
+    function getTextOfPropertyName(name) {
+        return ts.Debug.checkDefined(tryGetTextOfPropertyName(name));
+    }
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
@@ -15595,7 +15599,7 @@ var ts;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
             if (property.kind === 295 /* PropertyAssignment */) {
-                var propName = getTextOfPropertyName(property.name);
+                var propName = tryGetTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
             return false;
@@ -172619,47 +172623,18 @@ var ts;
             }
             return ts.deduplicate(outputs, ts.equateValues);
         }
-        function combineOutputResultContains(outputs, output, areEqual) {
-            return outputs.some(function (_a) {
-                var result = _a.result;
-                return ts.contains(result, output, areEqual);
-            });
-        }
-        function addToCombineOutputResult(outputs, project, result) {
-            if (result.length)
-                outputs.push({ project: project, result: result });
-        }
-        function combineProjectOutputFromEveryProject(projectService, action, areEqual) {
-            var outputs = [];
-            projectService.loadAncestorProjectTree();
-            projectService.forEachEnabledProject(function (project) {
-                var theseOutputs = action(project);
-                addToCombineOutputResult(outputs, project, ts.filter(theseOutputs, function (output) { return !combineOutputResultContains(outputs, output, areEqual); }));
-            });
-            return outputs;
-        }
-        function flattenCombineOutputResult(outputs) {
-            return ts.flatMap(outputs, function (_a) {
-                var result = _a.result;
-                return result;
-            });
-        }
-        function combineProjectOutputWhileOpeningReferencedProjects(projects, defaultProject, action, getLocation, resultsEqual) {
-            var outputs = [];
-            combineProjectOutputWorker(projects, defaultProject, 
-            /*initialLocation*/ undefined, function (project, _, tryAddToTodo) {
-                var theseOutputs = action(project);
-                addToCombineOutputResult(outputs, project, ts.filter(theseOutputs, function (output) { return !combineOutputResultContains(outputs, output, resultsEqual) && !tryAddToTodo(project, getLocation(output)); }));
-            });
-            return outputs;
-        }
-        function combineProjectOutputForRenameLocations(projects, defaultProject, initialLocation, findInStrings, findInComments, hostPreferences) {
+        ;
+        function combineProjectOutputForRenameLocations(projects, defaultProject, initialLocation, findInStrings, findInComments, _a) {
+            var providePrefixAndSuffixTextForRename = _a.providePrefixAndSuffixTextForRename;
             var outputs = [];
             combineProjectOutputWorker(projects, defaultProject, initialLocation, function (project, location, tryAddToTodo) {
-                for (var _i = 0, _a = project.getLanguageService().findRenameLocations(location.fileName, location.pos, findInStrings, findInComments, hostPreferences.providePrefixAndSuffixTextForRename) || server.emptyArray; _i < _a.length; _i++) {
-                    var output = _a[_i];
-                    if (!ts.contains(outputs, output, ts.documentSpansEqual) && !tryAddToTodo(project, documentSpanLocation(output))) {
-                        outputs.push(output);
+                var projectOutputs = project.getLanguageService().findRenameLocations(location.fileName, location.pos, findInStrings, findInComments, providePrefixAndSuffixTextForRename);
+                if (projectOutputs) {
+                    for (var _i = 0, projectOutputs_1 = projectOutputs; _i < projectOutputs_1.length; _i++) {
+                        var output = projectOutputs_1[_i];
+                        if (!ts.contains(outputs, output, ts.documentSpansEqual) && !tryAddToTodo(project, documentSpanLocation(output))) {
+                            outputs.push(output);
+                        }
                     }
                 }
             });
@@ -172674,43 +172649,33 @@ var ts;
             var outputs = [];
             combineProjectOutputWorker(projects, defaultProject, initialLocation, function (project, location, getMappedLocation) {
                 logger.info("Finding references to " + location.fileName + " position " + location.pos + " in project " + project.getProjectName());
-                var _loop_8 = function (outputReferencedSymbol) {
-                    var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(outputReferencedSymbol.definition));
-                    var definition = mappedDefinitionFile === undefined ?
-                        outputReferencedSymbol.definition : __assign(__assign({}, outputReferencedSymbol.definition), { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, outputReferencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(outputReferencedSymbol.definition, project) });
-                    var symbolToAddTo = ts.find(outputs, function (o) { return ts.documentSpansEqual(o.definition, definition); });
-                    if (!symbolToAddTo) {
-                        symbolToAddTo = { definition: definition, references: [] };
-                        outputs.push(symbolToAddTo);
-                    }
-                    for (var _b = 0, _c = outputReferencedSymbol.references; _b < _c.length; _b++) {
-                        var ref = _c[_b];
-                        // If it's in a mapped file, that is added to the todo list by `getMappedLocation`.
-                        if (!ts.contains(symbolToAddTo.references, ref, ts.documentSpansEqual) && !getMappedLocation(project, documentSpanLocation(ref))) {
-                            symbolToAddTo.references.push(ref);
+                var projectOutputs = project.getLanguageService().findReferences(location.fileName, location.pos);
+                if (projectOutputs) {
+                    var _loop_8 = function (referencedSymbol) {
+                        var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(referencedSymbol.definition));
+                        var definition = mappedDefinitionFile === undefined ?
+                            referencedSymbol.definition : __assign(__assign({}, referencedSymbol.definition), { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, referencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(referencedSymbol.definition, project) });
+                        var symbolToAddTo = ts.find(outputs, function (o) { return ts.documentSpansEqual(o.definition, definition); });
+                        if (!symbolToAddTo) {
+                            symbolToAddTo = { definition: definition, references: [] };
+                            outputs.push(symbolToAddTo);
+                        }
+                        for (var _a = 0, _b = referencedSymbol.references; _a < _b.length; _a++) {
+                            var ref = _b[_a];
+                            // If it's in a mapped file, that is added to the todo list by `getMappedLocation`.
+                            if (!ts.contains(symbolToAddTo.references, ref, ts.documentSpansEqual) && !getMappedLocation(project, documentSpanLocation(ref))) {
+                                symbolToAddTo.references.push(ref);
+                            }
                         }
+                    };
+                    for (var _i = 0, projectOutputs_2 = projectOutputs; _i < projectOutputs_2.length; _i++) {
+                        var referencedSymbol = projectOutputs_2[_i];
+                        _loop_8(referencedSymbol);
                     }
-                };
-                for (var _i = 0, _a = project.getLanguageService().findReferences(location.fileName, location.pos) || server.emptyArray; _i < _a.length; _i++) {
-                    var outputReferencedSymbol = _a[_i];
-                    _loop_8(outputReferencedSymbol);
                 }
             });
             return outputs.filter(function (o) { return o.references.length !== 0; });
         }
-        function combineProjectOutputForFileReferences(projects, defaultProject, fileName) {
-            var outputs = [];
-            combineProjectOutputWorker(projects, defaultProject, 
-            /*initialLocation*/ undefined, function (project) {
-                for (var _i = 0, _a = project.getLanguageService().getFileReferences(fileName) || server.emptyArray; _i < _a.length; _i++) {
-                    var referenceEntry = _a[_i];
-                    if (!ts.contains(outputs, referenceEntry, ts.documentSpansEqual)) {
-                        outputs.push(referenceEntry);
-                    }
-                }
-            });
-            return outputs;
-        }
         function forEachProjectInProjects(projects, path, cb) {
             for (var _i = 0, _a = ts.isArray(projects) ? projects : projects.projects; _i < _a.length; _i++) {
                 var project = _a[_i];
@@ -174049,7 +174014,21 @@ var ts;
             Session.prototype.getFileReferences = function (args, simplifiedResult) {
                 var _this = this;
                 var projects = this.getProjects(args);
-                var references = combineProjectOutputForFileReferences(projects, this.getDefaultProject(args), args.file);
+                var fileName = args.file;
+                var references = [];
+                forEachProjectInProjects(projects, /*path*/ undefined, function (project) {
+                    if (project.getCancellationToken().isCancellationRequested())
+                        return;
+                    var projectOutputs = project.getLanguageService().getFileReferences(fileName);
+                    if (projectOutputs) {
+                        for (var _i = 0, projectOutputs_3 = projectOutputs; _i < projectOutputs_3.length; _i++) {
+                            var referenceEntry = projectOutputs_3[_i];
+                            if (!ts.contains(references, referenceEntry, ts.documentSpansEqual)) {
+                                references.push(referenceEntry);
+                            }
+                        }
+                    }
+                });
                 if (!simplifiedResult)
                     return references;
                 var refs = references.map(function (entry) { return referenceEntryToReferencesResponseItem(_this.projectService, entry); });
@@ -174448,10 +174427,13 @@ var ts;
             Session.prototype.getNavigateToItems = function (args, simplifiedResult) {
                 var full = this.getFullNavigateToItems(args);
                 return !simplifiedResult ?
-                    flattenCombineOutputResult(full) :
                     ts.flatMap(full, function (_a) {
-                        var project = _a.project, result = _a.result;
-                        return result.map(function (navItem) {
+                        var navigateToItems = _a.navigateToItems;
+                        return navigateToItems;
+                    }) :
+                    ts.flatMap(full, function (_a) {
+                        var project = _a.project, navigateToItems = _a.navigateToItems;
+                        return navigateToItems.map(function (navItem) {
                             var scriptInfo = project.getScriptInfo(navItem.fileName);
                             var bakedItem = {
                                 name: navItem.name,
@@ -174481,13 +174463,57 @@ var ts;
                 if (currentFileOnly) {
                     ts.Debug.assertIsDefined(args.file);
                     var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                    return [{ project: project, result: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
+                    return [{ project: project, navigateToItems: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
+                }
+                var outputs = [];
+                // This is effectively a hashset with `name` as the custom hash and `navigateToItemIsEqualTo` as the custom equals.
+                // `name` is a very cheap hash function, but we could incorporate other properties to reduce collisions.
+                var seenItems = new ts.Map(); // name to items with that name
+                if (!args.file && !projectFileName) {
+                    // VS Code's `Go to symbol in workspaces` sends request like this
+                    // TODO (https://github.com/microsoft/TypeScript/issues/47839)
+                    // This appears to have been intended to search all projects but, in practice, it seems to only search
+                    // those that are downstream from already-loaded projects.
+                    // Filtering by !isSourceOfProjectReferenceRedirect is new, but seems appropriate and consistent with
+                    // the case below.
+                    this.projectService.loadAncestorProjectTree();
+                    this.projectService.forEachEnabledProject(function (project) { return addItemsForProject(project); });
                 }
-                else if (!args.file && !projectFileName) {
-                    return combineProjectOutputFromEveryProject(this.projectService, function (project) { return project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, /*filename*/ undefined, /*excludeDts*/ project.isNonTsProject()); }, navigateToItemIsEqualTo);
+                else {
+                    // VS's `Go to symbol` sends requests with just a project and doesn't want cascading since it will
+                    // send a separate request for each project of interest
+                    // TODO (https://github.com/microsoft/TypeScript/issues/47839)
+                    // This doesn't really make sense unless it's a single project matching `projectFileName`
+                    var projects = this.getProjects(args);
+                    forEachProjectInProjects(projects, /*path*/ undefined, function (project) { return addItemsForProject(project); });
+                }
+                return outputs;
+                // Mutates `outputs`
+                function addItemsForProject(project) {
+                    var projectItems = project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, /*filename*/ undefined, /*excludeDts*/ project.isNonTsProject());
+                    var unseenItems = ts.filter(projectItems, function (item) { return tryAddSeenItem(item) && !getMappedLocation(documentSpanLocation(item), project); });
+                    if (unseenItems.length) {
+                        outputs.push({ project: project, navigateToItems: unseenItems });
+                    }
+                }
+                // Returns true if the item had not been seen before
+                // Mutates `seenItems`
+                function tryAddSeenItem(item) {
+                    var name = item.name;
+                    if (!seenItems.has(name)) {
+                        seenItems.set(name, [item]);
+                        return true;
+                    }
+                    var seen = seenItems.get(name);
+                    for (var _i = 0, seen_1 = seen; _i < seen_1.length; _i++) {
+                        var seenItem = seen_1[_i];
+                        if (navigateToItemIsEqualTo(seenItem, item)) {
+                            return false;
+                        }
+                    }
+                    seen.push(item);
+                    return true;
                 }
-                var fileArgs = args;
-                return combineProjectOutputWhileOpeningReferencedProjects(this.getProjects(fileArgs), this.getDefaultProject(fileArgs), function (project) { return project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, /*fileName*/ undefined, /*excludeDts*/ project.isNonTsProject()); }, documentSpanLocation, navigateToItemIsEqualTo);
                 function navigateToItemIsEqualTo(a, b) {
                     if (a === b) {
                         return true;
@@ -174579,8 +174605,28 @@ var ts;
                 var newPath = server.toNormalizedPath(args.newFilePath);
                 var formatOptions = this.getHostFormatOptions();
                 var preferences = this.getHostPreferences();
-                var changes = flattenCombineOutputResult(combineProjectOutputFromEveryProject(this.projectService, function (project) { return project.getLanguageService().getEditsForFileRename(oldPath, newPath, formatOptions, preferences); }, function (a, b) { return a.fileName === b.fileName; }));
-                return simplifiedResult ? changes.map(function (c) { return _this.mapTextChangeToCodeEdit(c); }) : changes;
+                var seenFiles = new ts.Set();
+                var textChanges = [];
+                // TODO (https://github.com/microsoft/TypeScript/issues/47839)
+                // This appears to have been intended to search all projects but, in practice, it seems to only search
+                // those that are downstream from already-loaded projects.
+                this.projectService.loadAncestorProjectTree();
+                this.projectService.forEachEnabledProject(function (project) {
+                    var projectTextChanges = project.getLanguageService().getEditsForFileRename(oldPath, newPath, formatOptions, preferences);
+                    var projectFiles = [];
+                    for (var _i = 0, projectTextChanges_1 = projectTextChanges; _i < projectTextChanges_1.length; _i++) {
+                        var textChange = projectTextChanges_1[_i];
+                        if (!seenFiles.has(textChange.fileName)) {
+                            textChanges.push(textChange);
+                            projectFiles.push(textChange.fileName);
+                        }
+                    }
+                    for (var _a = 0, projectFiles_1 = projectFiles; _a < projectFiles_1.length; _a++) {
+                        var file = projectFiles_1[_a];
+                        seenFiles.add(file);
+                    }
+                });
+                return simplifiedResult ? textChanges.map(function (c) { return _this.mapTextChangeToCodeEdit(c); }) : textChanges;
             };
             Session.prototype.getCodeFixes = function (args, simplifiedResult) {
                 var _this = this;

package/lib/typescript.js

@@ -294,7 +294,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.20220307";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220308";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -15027,7 +15027,7 @@ var ts;
         return name.kind === 161 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
-    function getTextOfPropertyName(name) {
+    function tryGetTextOfPropertyName(name) {
         switch (name.kind) {
             case 79 /* Identifier */:
             case 80 /* PrivateIdentifier */:
@@ -15039,11 +15039,15 @@ var ts;
             case 161 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
-                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+                return undefined;
             default:
                 return ts.Debug.assertNever(name);
         }
     }
+    ts.tryGetTextOfPropertyName = tryGetTextOfPropertyName;
+    function getTextOfPropertyName(name) {
+        return ts.Debug.checkDefined(tryGetTextOfPropertyName(name));
+    }
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
@@ -15595,7 +15599,7 @@ var ts;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
             if (property.kind === 295 /* PropertyAssignment */) {
-                var propName = getTextOfPropertyName(property.name);
+                var propName = tryGetTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
             return false;

package/lib/typescriptServices.js

@@ -294,7 +294,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.20220307";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220308";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -15027,7 +15027,7 @@ var ts;
         return name.kind === 161 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
-    function getTextOfPropertyName(name) {
+    function tryGetTextOfPropertyName(name) {
         switch (name.kind) {
             case 79 /* Identifier */:
             case 80 /* PrivateIdentifier */:
@@ -15039,11 +15039,15 @@ var ts;
             case 161 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
-                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+                return undefined;
             default:
                 return ts.Debug.assertNever(name);
         }
     }
+    ts.tryGetTextOfPropertyName = tryGetTextOfPropertyName;
+    function getTextOfPropertyName(name) {
+        return ts.Debug.checkDefined(tryGetTextOfPropertyName(name));
+    }
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
@@ -15595,7 +15599,7 @@ var ts;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
             if (property.kind === 295 /* PropertyAssignment */) {
-                var propName = getTextOfPropertyName(property.name);
+                var propName = tryGetTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
             return false;

package/lib/typingsInstaller.js

@@ -89,7 +89,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.20220307";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220308";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -14822,7 +14822,7 @@ var ts;
         return name.kind === 161 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
-    function getTextOfPropertyName(name) {
+    function tryGetTextOfPropertyName(name) {
         switch (name.kind) {
             case 79 /* Identifier */:
             case 80 /* PrivateIdentifier */:
@@ -14834,11 +14834,15 @@ var ts;
             case 161 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
-                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+                return undefined;
             default:
                 return ts.Debug.assertNever(name);
         }
     }
+    ts.tryGetTextOfPropertyName = tryGetTextOfPropertyName;
+    function getTextOfPropertyName(name) {
+        return ts.Debug.checkDefined(tryGetTextOfPropertyName(name));
+    }
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
@@ -15390,7 +15394,7 @@ var ts;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
             if (property.kind === 295 /* PropertyAssignment */) {
-                var propName = getTextOfPropertyName(property.name);
+                var propName = tryGetTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
             return false;

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.7.0-dev.20220307",
+    "version": "4.7.0-dev.20220308",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [