typescript 4.8.0-dev.20220707 → 4.8.0-dev.20220708

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.20220707";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220708";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2250,7 +2250,7 @@ var ts;
      *         and 1 insertion/deletion at 3 characters)
      */
     function getSpellingSuggestion(name, candidates, getName) {
-        var maximumLengthDifference = Math.min(2, Math.floor(name.length * 0.34));
+        var maximumLengthDifference = Math.max(2, Math.floor(name.length * 0.34));
         var bestDistance = Math.floor(name.length * 0.4) + 1; // If the best result is worse than this, don't bother.
         var bestCandidate;
         for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
@@ -9234,6 +9234,7 @@ var ts;
         The_type_of_this_expression_cannot_be_named_without_a_resolution_mode_assertion_which_is_an_unstable_feature_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next: diag(2841, ts.DiagnosticCategory.Error, "The_type_of_this_expression_cannot_be_named_without_a_resolution_mode_assertion_which_is_an_unstable_2841", "The type of this expression cannot be named without a 'resolution-mode' assertion, which is an unstable feature. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'."),
         _0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation: diag(2842, ts.DiagnosticCategory.Error, "_0_is_an_unused_renaming_of_1_Did_you_intend_to_use_it_as_a_type_annotation_2842", "'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?"),
         We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here: diag(2843, ts.DiagnosticCategory.Error, "We_can_only_write_a_type_for_0_by_adding_a_type_for_the_entire_parameter_here_2843", "We can only write a type for '{0}' by adding a type for the entire parameter here."),
+        Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2844, ts.DiagnosticCategory.Error, "Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2844", "Type of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -44613,6 +44614,7 @@ var ts;
         return toSearchResult(/*value*/ undefined);
     }
     /**
+     * @internal
      * From https://github.com/nodejs/node/blob/8f39f51cbbd3b2de14b9ee896e26421cc5b20121/lib/internal/modules/esm/resolve.js#L722 -
      * "longest" has some nuance as to what "longest" means in the presence of pattern trailers
      */
@@ -44635,6 +44637,7 @@ var ts;
             return 1;
         return 0;
     }
+    ts.comparePatternKeys = comparePatternKeys;
     function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
         var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
         if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
@@ -50441,6 +50444,7 @@ var ts;
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 111551 /* Value */)) {
                                     // Remember the property node, it will be used later to report appropriate error
+                                    ts.Debug.assertNode(location, ts.isPropertyDeclaration);
                                     propertyWithInvalidInitializer = location;
                                 }
                             }
@@ -50630,11 +50634,27 @@ var ts;
                     }
                 }
             }
+            // The invalid initializer error is needed in two situation:
+            // 1. When result is undefined, after checking for a missing "this."
+            // 2. When result is defined
+            function checkAndReportErrorForInvalidInitializer() {
+                if (propertyWithInvalidInitializer && !(ts.getEmitScriptTarget(compilerOptions) === 99 /* ESNext */ && useDefineForClassFields)) {
+                    // We have a match, but the reference occurred within a property initializer and the identifier also binds
+                    // to a local variable in the constructor where the code will be emitted. Note that this is actually allowed
+                    // with ESNext+useDefineForClassFields because the scope semantics are different.
+                    error(errorLocation, errorLocation && propertyWithInvalidInitializer.type && ts.textRangeContainsPositionInclusive(propertyWithInvalidInitializer.type, errorLocation.pos)
+                        ? ts.Diagnostics.Type_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor
+                        : ts.Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor, ts.declarationNameToString(propertyWithInvalidInitializer.name), diagnosticName(nameArg));
+                    return true;
+                }
+                return false;
+            }
             if (!result) {
                 if (nameNotFoundMessage) {
                     addLazyDiagnostic(function () {
                         if (!errorLocation ||
                             !checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) && // TODO: GH#18217
+                                !checkAndReportErrorForInvalidInitializer() &&
                                 !checkAndReportErrorForExtendingInterface(errorLocation) &&
                                 !checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) &&
                                 !checkAndReportErrorForExportingPrimitiveType(errorLocation, name) &&
@@ -50642,7 +50662,16 @@ var ts;
                                 !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
                                 !checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
                             var suggestion = void 0;
-                            if (getSpellingSuggestions && suggestionCount < maximumSuggestionCount) {
+                            var suggestedLib = void 0;
+                            // Report missing lib first
+                            if (nameArg) {
+                                suggestedLib = getSuggestedLibForNonExistentName(nameArg);
+                                if (suggestedLib) {
+                                    error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg), suggestedLib);
+                                }
+                            }
+                            // then spelling suggestions
+                            if (!suggestedLib && getSpellingSuggestions && suggestionCount < maximumSuggestionCount) {
                                 suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
                                 var isGlobalScopeAugmentationDeclaration = (suggestion === null || suggestion === void 0 ? void 0 : suggestion.valueDeclaration) && ts.isAmbientModule(suggestion.valueDeclaration) && ts.isGlobalScopeAugmentation(suggestion.valueDeclaration);
                                 if (isGlobalScopeAugmentationDeclaration) {
@@ -50661,16 +50690,9 @@ var ts;
                                     }
                                 }
                             }
-                            if (!suggestion) {
-                                if (nameArg) {
-                                    var lib = getSuggestedLibForNonExistentName(nameArg);
-                                    if (lib) {
-                                        error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg), lib);
-                                    }
-                                    else {
-                                        error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg));
-                                    }
-                                }
+                            // And then fall back to unspecified "not found"
+                            if (!suggestion && !suggestedLib && nameArg) {
+                                error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg));
                             }
                             suggestionCount++;
                         }
@@ -50678,12 +50700,7 @@ var ts;
                 }
                 return undefined;
             }
-            if (propertyWithInvalidInitializer && !(ts.getEmitScriptTarget(compilerOptions) === 99 /* ESNext */ && useDefineForClassFields)) {
-                // We have a match, but the reference occurred within a property initializer and the identifier also binds
-                // to a local variable in the constructor where the code will be emitted. Note that this is actually allowed
-                // with ESNext+useDefineForClassFields because the scope semantics are different.
-                var propertyName = propertyWithInvalidInitializer.name;
-                error(errorLocation, ts.Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor, ts.declarationNameToString(propertyName), diagnosticName(nameArg));
+            else if (checkAndReportErrorForInvalidInitializer()) {
                 return undefined;
             }
             // Perform extra checks only if error reporting was requested
@@ -62550,19 +62567,22 @@ var ts;
          * to reduce the resulting type if possible (since only intersections with conflicting literal-typed properties are reducible).
          */
         function isPossiblyReducibleByInstantiation(type) {
-            return ts.some(type.types, function (t) {
-                var uniqueFilled = getUniqueLiteralFilledInstantiation(t);
-                return getReducedType(uniqueFilled) !== uniqueFilled;
-            });
+            var uniqueFilled = getUniqueLiteralFilledInstantiation(type);
+            return getReducedType(uniqueFilled) !== uniqueFilled;
+        }
+        function shouldDeferIndexType(type) {
+            return !!(type.flags & 58982400 /* InstantiableNonPrimitive */ ||
+                isGenericTupleType(type) ||
+                isGenericMappedType(type) && !hasDistributiveNameType(type) ||
+                type.flags & 1048576 /* Union */ && ts.some(type.types, isPossiblyReducibleByInstantiation) ||
+                type.flags & 2097152 /* Intersection */ && maybeTypeOfKind(type, 465829888 /* Instantiable */) && ts.some(type.types, isEmptyAnonymousObjectType));
         }
         function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
             type = getReducedType(type);
-            return type.flags & 1048576 /* Union */ ? isPossiblyReducibleByInstantiation(type)
-                ? getIndexTypeForGenericType(type, stringsOnly)
-                : getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
-                    type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) || isGenericMappedType(type) && !hasDistributiveNameType(type) ? getIndexTypeForGenericType(type, stringsOnly) :
+            return shouldDeferIndexType(type) ? getIndexTypeForGenericType(type, stringsOnly) :
+                type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                    type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                         ts.getObjectFlags(type) & 32 /* Mapped */ ? getIndexTypeForMappedType(type, stringsOnly, noIndexSignatures) :
                             type === wildcardType ? wildcardType :
                                 type.flags & 2 /* Unknown */ ? neverType :
@@ -70152,6 +70172,15 @@ var ts;
                         var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
+                    break;
+                case 201 /* ObjectBindingPattern */:
+                case 202 /* ArrayBindingPattern */:
+                case 256 /* FunctionDeclaration */:
+                case 213 /* FunctionExpression */:
+                case 214 /* ArrowFunction */:
+                case 169 /* MethodDeclaration */:
+                    // Handle pseudo-references originating in getNarrowedTypeOfSymbol.
+                    return getNodeId(node) + "#" + getTypeId(declaredType);
             }
             return undefined;
         }
@@ -132984,6 +133013,26 @@ var ts;
     (function (Completions) {
         var StringCompletions;
         (function (StringCompletions) {
+            var _a;
+            var kindPrecedence = (_a = {},
+                _a["directory" /* directory */] = 0,
+                _a["script" /* scriptElement */] = 1,
+                _a["external module name" /* externalModuleName */] = 2,
+                _a);
+            function createNameAndKindSet() {
+                var map = new ts.Map();
+                function add(value) {
+                    var existing = map.get(value.name);
+                    if (!existing || kindPrecedence[existing.kind] < kindPrecedence[value.kind]) {
+                        map.set(value.name, value);
+                    }
+                }
+                return {
+                    add: add,
+                    has: map.has.bind(map),
+                    values: map.values.bind(map),
+                };
+            }
             function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences) {
                 if (ts.isInReferenceComment(sourceFile, position)) {
                     var entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
@@ -133265,11 +133314,12 @@ var ts;
             }
             function getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker, preferences) {
                 var literalValue = ts.normalizeSlashes(node.text);
+                var mode = ts.isStringLiteralLike(node) ? ts.getModeForUsageLocation(sourceFile, node) : undefined;
                 var scriptPath = sourceFile.path;
                 var scriptDirectory = ts.getDirectoryPath(scriptPath);
                 return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && (ts.isRootedDiskPath(literalValue) || ts.isUrl(literalValue))
                     ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath, getIncludeExtensionOption())
-                    : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, compilerOptions, host, typeChecker);
+                    : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, mode, compilerOptions, host, getIncludeExtensionOption(), typeChecker);
                 function getIncludeExtensionOption() {
                     var mode = ts.isStringLiteralLike(node) ? ts.getModeForUsageLocation(sourceFile, node) : undefined;
                     return preferences.importModuleSpecifierEnding === "js" || mode === ts.ModuleKind.ESNext ? 2 /* ModuleSpecifierCompletion */ : 0 /* Exclude */;
@@ -133285,7 +133335,7 @@ var ts;
                     return getCompletionEntriesForDirectoryFragmentWithRootDirs(compilerOptions.rootDirs, literalValue, scriptDirectory, extensionOptions, compilerOptions, host, scriptPath);
                 }
                 else {
-                    return getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath);
+                    return ts.arrayFrom(getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath).values());
                 }
             }
             function isEmitResolutionKindUsingNodeModules(compilerOptions) {
@@ -133321,7 +133371,7 @@ var ts;
                 var basePath = compilerOptions.project || host.getCurrentDirectory();
                 var ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
                 var baseDirectories = getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptDirectory, ignoreCase);
-                return ts.flatMap(baseDirectories, function (baseDirectory) { return getCompletionEntriesForDirectoryFragment(fragment, baseDirectory, extensionOptions, host, exclude); });
+                return ts.flatMap(baseDirectories, function (baseDirectory) { return ts.arrayFrom(getCompletionEntriesForDirectoryFragment(fragment, baseDirectory, extensionOptions, host, exclude).values()); });
             }
             var IncludeExtensionsOption;
             (function (IncludeExtensionsOption) {
@@ -133332,10 +133382,9 @@ var ts;
             /**
              * Given a path ending at a directory, gets the completions for the path, and filters for those entries containing the basename.
              */
-            function getCompletionEntriesForDirectoryFragment(fragment, scriptPath, _a, host, exclude, result) {
-                var _b;
-                var extensions = _a.extensions, includeExtensionsOption = _a.includeExtensionsOption;
-                if (result === void 0) { result = []; }
+            function getCompletionEntriesForDirectoryFragment(fragment, scriptPath, extensionOptions, host, exclude, result) {
+                var _a;
+                if (result === void 0) { result = createNameAndKindSet(); }
                 if (fragment === undefined) {
                     fragment = "";
                 }
@@ -133359,11 +133408,11 @@ var ts;
                     var packageJson = ts.readJson(packageJsonPath, host);
                     var typesVersions = packageJson.typesVersions;
                     if (typeof typesVersions === "object") {
-                        var versionPaths = (_b = ts.getPackageJsonTypesVersionsPaths(typesVersions)) === null || _b === void 0 ? void 0 : _b.paths;
+                        var versionPaths = (_a = ts.getPackageJsonTypesVersionsPaths(typesVersions)) === null || _a === void 0 ? void 0 : _a.paths;
                         if (versionPaths) {
                             var packageDirectory = ts.getDirectoryPath(packageJsonPath);
                             var pathInPackage = absolutePath.slice(ts.ensureTrailingDirectorySeparator(packageDirectory).length);
-                            if (addCompletionEntriesFromPaths(result, pathInPackage, packageDirectory, extensions, versionPaths, host)) {
+                            if (addCompletionEntriesFromPaths(result, pathInPackage, packageDirectory, extensionOptions, host, versionPaths)) {
                                 // A true result means one of the `versionPaths` was matched, which will block relative resolution
                                 // to files and folders from here. All reachable paths given the pattern match are already added.
                                 return result;
@@ -133375,39 +133424,17 @@ var ts;
                 if (!ts.tryDirectoryExists(host, baseDirectory))
                     return result;
                 // Enumerate the available files if possible
-                var files = ts.tryReadDirectory(host, baseDirectory, extensions, /*exclude*/ undefined, /*include*/ ["./*"]);
+                var files = ts.tryReadDirectory(host, baseDirectory, extensionOptions.extensions, /*exclude*/ undefined, /*include*/ ["./*"]);
                 if (files) {
-                    /**
-                     * Multiple file entries might map to the same truncated name once we remove extensions
-                     * (happens iff includeExtensionsOption === includeExtensionsOption.Exclude) so we use a set-like data structure. Eg:
-                     *
-                     * both foo.ts and foo.tsx become foo
-                     */
-                    var foundFiles = new ts.Map(); // maps file to its extension
                     for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
                         var filePath = files_1[_i];
                         filePath = ts.normalizePath(filePath);
                         if (exclude && ts.comparePaths(filePath, exclude, scriptPath, ignoreCase) === 0 /* EqualTo */) {
                             continue;
                         }
-                        var foundFileName = void 0;
-                        var outputExtension = ts.moduleSpecifiers.tryGetJSExtensionForFile(filePath, host.getCompilationSettings());
-                        if (includeExtensionsOption === 0 /* Exclude */ && !ts.fileExtensionIsOneOf(filePath, [".json" /* Json */, ".mts" /* Mts */, ".cts" /* Cts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */, ".mjs" /* Mjs */, ".cjs" /* Cjs */])) {
-                            foundFileName = ts.removeFileExtension(ts.getBaseFileName(filePath));
-                            foundFiles.set(foundFileName, ts.tryGetExtensionFromPath(filePath));
-                        }
-                        else if ((ts.fileExtensionIsOneOf(filePath, [".mts" /* Mts */, ".cts" /* Cts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]) || includeExtensionsOption === 2 /* ModuleSpecifierCompletion */) && outputExtension) {
-                            foundFileName = ts.changeExtension(ts.getBaseFileName(filePath), outputExtension);
-                            foundFiles.set(foundFileName, outputExtension);
-                        }
-                        else {
-                            foundFileName = ts.getBaseFileName(filePath);
-                            foundFiles.set(foundFileName, ts.tryGetExtensionFromPath(filePath));
-                        }
+                        var _b = getFilenameWithExtensionOption(ts.getBaseFileName(filePath), host.getCompilationSettings(), extensionOptions.includeExtensionsOption), name = _b.name, extension = _b.extension;
+                        result.add(nameAndKind(name, "script" /* scriptElement */, extension));
                     }
-                    foundFiles.forEach(function (ext, foundFile) {
-                        result.push(nameAndKind(foundFile, "script" /* scriptElement */, ext));
-                    });
                 }
                 // If possible, get folder completion as well
                 var directories = ts.tryGetDirectories(host, baseDirectory);
@@ -133416,27 +133443,52 @@ var ts;
                         var directory = directories_1[_c];
                         var directoryName = ts.getBaseFileName(ts.normalizePath(directory));
                         if (directoryName !== "@types") {
-                            result.push(directoryResult(directoryName));
+                            result.add(directoryResult(directoryName));
                         }
                     }
                 }
                 return result;
             }
+            function getFilenameWithExtensionOption(name, compilerOptions, includeExtensionsOption) {
+                var outputExtension = ts.moduleSpecifiers.tryGetJSExtensionForFile(name, compilerOptions);
+                if (includeExtensionsOption === 0 /* Exclude */ && !ts.fileExtensionIsOneOf(name, [".json" /* Json */, ".mts" /* Mts */, ".cts" /* Cts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */, ".mjs" /* Mjs */, ".cjs" /* Cjs */])) {
+                    return { name: ts.removeFileExtension(name), extension: ts.tryGetExtensionFromPath(name) };
+                }
+                else if ((ts.fileExtensionIsOneOf(name, [".mts" /* Mts */, ".cts" /* Cts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]) || includeExtensionsOption === 2 /* ModuleSpecifierCompletion */) && outputExtension) {
+                    return { name: ts.changeExtension(name, outputExtension), extension: outputExtension };
+                }
+                else {
+                    return { name: name, extension: ts.tryGetExtensionFromPath(name) };
+                }
+            }
             /** @returns whether `fragment` was a match for any `paths` (which should indicate whether any other path completions should be offered) */
-            function addCompletionEntriesFromPaths(result, fragment, baseDirectory, fileExtensions, paths, host) {
-                var _a;
+            function addCompletionEntriesFromPaths(result, fragment, baseDirectory, extensionOptions, host, paths) {
+                var getPatternsForKey = function (key) { return paths[key]; };
+                var comparePaths = function (a, b) {
+                    var patternA = ts.tryParsePattern(a);
+                    var patternB = ts.tryParsePattern(b);
+                    var lengthA = typeof patternA === "object" ? patternA.prefix.length : a.length;
+                    var lengthB = typeof patternB === "object" ? patternB.prefix.length : b.length;
+                    return ts.compareValues(lengthB, lengthA);
+                };
+                return addCompletionEntriesFromPathsOrExports(result, fragment, baseDirectory, extensionOptions, host, ts.getOwnKeys(paths), getPatternsForKey, comparePaths);
+            }
+            /** @returns whether `fragment` was a match for any `paths` (which should indicate whether any other path completions should be offered) */
+            function addCompletionEntriesFromPathsOrExports(result, fragment, baseDirectory, extensionOptions, host, keys, getPatternsForKey, comparePaths) {
                 var pathResults = [];
-                var matchedPathPrefixLength = -1;
-                for (var path in paths) {
-                    if (!ts.hasProperty(paths, path))
+                var matchedPath;
+                for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+                    var key = keys_1[_i];
+                    if (key === ".")
                         continue;
-                    var patterns = paths[path];
+                    var keyWithoutLeadingDotSlash = key.replace(/^\.\//, ""); // remove leading "./"
+                    var patterns = getPatternsForKey(key);
                     if (patterns) {
-                        var pathPattern = ts.tryParsePattern(path);
+                        var pathPattern = ts.tryParsePattern(keyWithoutLeadingDotSlash);
                         if (!pathPattern)
                             continue;
                         var isMatch = typeof pathPattern === "object" && ts.isPatternMatch(pathPattern, fragment);
-                        var isLongestMatch = isMatch && (matchedPathPrefixLength === undefined || pathPattern.prefix.length > matchedPathPrefixLength);
+                        var isLongestMatch = isMatch && (matchedPath === undefined || comparePaths(key, matchedPath) === -1 /* LessThan */);
                         if (isLongestMatch) {
                             // If this is a higher priority match than anything we've seen so far, previous results from matches are invalid, e.g.
                             // for `import {} from "some-package/|"` with a typesVersions:
@@ -133449,13 +133501,13 @@ var ts;
                             //                                 added by the '*' match, after typing `"some-package/foo/|"` we would get file results from both
                             //                                 ./dist/foo and ./foo, when only the latter will actually be resolvable.
                             //                                 See pathCompletionsTypesVersionsWildcard6.ts.
-                            matchedPathPrefixLength = pathPattern.prefix.length;
+                            matchedPath = key;
                             pathResults = pathResults.filter(function (r) { return !r.matchedPattern; });
                         }
-                        if (typeof pathPattern === "string" || matchedPathPrefixLength === undefined || pathPattern.prefix.length >= matchedPathPrefixLength) {
+                        if (typeof pathPattern === "string" || matchedPath === undefined || comparePaths(key, matchedPath) !== 1 /* GreaterThan */) {
                             pathResults.push({
                                 matchedPattern: isMatch,
-                                results: getCompletionsForPathMapping(path, patterns, fragment, baseDirectory, fileExtensions, host)
+                                results: getCompletionsForPathMapping(keyWithoutLeadingDotSlash, patterns, fragment, baseDirectory, extensionOptions, host)
                                     .map(function (_a) {
                                     var name = _a.name, kind = _a.kind, extension = _a.extension;
                                     return nameAndKind(name, kind, extension);
@@ -133464,10 +133516,8 @@ var ts;
                         }
                     }
                 }
-                var equatePaths = ((_a = host.useCaseSensitiveFileNames) === null || _a === void 0 ? void 0 : _a.call(host)) ? ts.equateStringsCaseSensitive : ts.equateStringsCaseInsensitive;
-                var equateResults = function (a, b) { return equatePaths(a.name, b.name); };
-                pathResults.forEach(function (pathResult) { return pathResult.results.forEach(function (pathResult) { return ts.pushIfUnique(result, pathResult, equateResults); }); });
-                return matchedPathPrefixLength > -1;
+                pathResults.forEach(function (pathResult) { return pathResult.results.forEach(function (r) { return result.add(r); }); });
+                return matchedPath !== undefined;
             }
             /**
              * Check all of the declared modules and those in node modules. Possible sources of modules:
@@ -133476,22 +133526,22 @@ var ts;
              *      Modules from node_modules (i.e. those listed in package.json)
              *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
              */
-            function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
+            function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, compilerOptions, host, includeExtensionsOption, typeChecker) {
                 var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
-                var result = [];
-                var extensionOptions = getExtensionOptions(compilerOptions);
+                var result = createNameAndKindSet();
+                var extensionOptions = getExtensionOptions(compilerOptions, includeExtensionsOption);
                 if (baseUrl) {
                     var projectDir = compilerOptions.project || host.getCurrentDirectory();
                     var absolute = ts.normalizePath(ts.combinePaths(projectDir, baseUrl));
                     getCompletionEntriesForDirectoryFragment(fragment, absolute, extensionOptions, host, /*exclude*/ undefined, result);
                     if (paths) {
-                        addCompletionEntriesFromPaths(result, fragment, absolute, extensionOptions.extensions, paths, host);
+                        addCompletionEntriesFromPaths(result, fragment, absolute, extensionOptions, host, paths);
                     }
                 }
                 var fragmentDirectory = getFragmentDirectory(fragment);
                 for (var _i = 0, _a = getAmbientModuleCompletions(fragment, fragmentDirectory, typeChecker); _i < _a.length; _i++) {
                     var ambientName = _a[_i];
-                    result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                    result.add(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                 }
                 getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
                 if (isEmitResolutionKindUsingNodeModules(compilerOptions)) {
@@ -133499,15 +133549,13 @@ var ts;
                     // (But do if we didn't find anything, e.g. 'package.json' missing.)
                     var foundGlobal = false;
                     if (fragmentDirectory === undefined) {
-                        var _loop_3 = function (moduleName) {
-                            if (!result.some(function (entry) { return entry.name === moduleName; })) {
-                                foundGlobal = true;
-                                result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
-                            }
-                        };
                         for (var _b = 0, _c = enumerateNodeModulesVisibleToScript(host, scriptPath); _b < _c.length; _b++) {
                             var moduleName = _c[_b];
-                            _loop_3(moduleName);
+                            var moduleResult = nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined);
+                            if (!result.has(moduleResult.name)) {
+                                foundGlobal = true;
+                                result.add(moduleResult);
+                            }
                         }
                     }
                     if (!foundGlobal) {
@@ -133533,39 +133581,19 @@ var ts;
                                     }
                                     packagePath = ts.combinePaths(packagePath, subName);
                                 }
-                                var packageFile = ts.combinePaths(ancestor, "node_modules", packagePath, "package.json");
+                                var packageDirectory = ts.combinePaths(ancestor, "node_modules", packagePath);
+                                var packageFile = ts.combinePaths(packageDirectory, "package.json");
                                 if (ts.tryFileExists(host, packageFile)) {
                                     var packageJson = ts.readJson(packageFile, host);
-                                    var exports = packageJson.exports;
-                                    if (exports) {
-                                        if (typeof exports !== "object" || exports === null) { // eslint-disable-line no-null/no-null
+                                    var exports_1 = packageJson.exports;
+                                    if (exports_1) {
+                                        if (typeof exports_1 !== "object" || exports_1 === null) { // eslint-disable-line no-null/no-null
                                             return; // null exports or entrypoint only, no sub-modules available
                                         }
-                                        var keys = ts.getOwnKeys(exports);
-                                        var fragmentSubpath_1 = components.join("/");
-                                        var processedKeys = ts.mapDefined(keys, function (k) {
-                                            if (k === ".")
-                                                return undefined;
-                                            if (!ts.startsWith(k, "./"))
-                                                return undefined;
-                                            var subpath = k.substring(2);
-                                            if (!ts.startsWith(subpath, fragmentSubpath_1))
-                                                return undefined;
-                                            // subpath is a valid export (barring conditions, which we don't currently check here)
-                                            if (!ts.stringContains(subpath, "*")) {
-                                                return subpath;
-                                            }
-                                            // pattern export - only return everything up to the `*`, so the user can autocomplete, then
-                                            // keep filling in the pattern (we could speculatively return a list of options by hitting disk,
-                                            // but conditions will make that somewhat awkward, as each condition may have a different set of possible
-                                            // options for the `*`.
-                                            return subpath.slice(0, subpath.indexOf("*"));
-                                        });
-                                        ts.forEach(processedKeys, function (k) {
-                                            if (k) {
-                                                result.push(nameAndKind(k, "external module name" /* externalModuleName */, /*extension*/ undefined));
-                                            }
-                                        });
+                                        var keys = ts.getOwnKeys(exports_1);
+                                        var fragmentSubpath = components.join("/") + (components.length && ts.hasTrailingDirectorySeparator(fragment) ? "/" : "");
+                                        var conditions_1 = mode === ts.ModuleKind.ESNext ? ["node", "import", "types"] : ["node", "require", "types"];
+                                        addCompletionEntriesFromPathsOrExports(result, fragmentSubpath, packageDirectory, extensionOptions, host, keys, function (key) { return ts.singleElementArray(getPatternFromFirstMatchingCondition(exports_1[key], conditions_1)); }, ts.comparePatternKeys);
                                         return;
                                     }
                                 }
@@ -133575,31 +133603,44 @@ var ts;
                         ts.forEachAncestorDirectory(scriptPath, ancestorLookup);
                     }
                 }
-                return result;
+                return ts.arrayFrom(result.values());
+            }
+            function getPatternFromFirstMatchingCondition(target, conditions) {
+                if (typeof target === "string") {
+                    return target;
+                }
+                if (target && typeof target === "object" && !ts.isArray(target)) {
+                    for (var condition in target) {
+                        if (condition === "default" || conditions.indexOf(condition) > -1 || ts.isApplicableVersionedTypesKey(conditions, condition)) {
+                            var pattern = target[condition];
+                            return getPatternFromFirstMatchingCondition(pattern, conditions);
+                        }
+                    }
+                }
             }
             function getFragmentDirectory(fragment) {
                 return containsSlash(fragment) ? ts.hasTrailingDirectorySeparator(fragment) ? fragment : ts.getDirectoryPath(fragment) : undefined;
             }
-            function getCompletionsForPathMapping(path, patterns, fragment, baseUrl, fileExtensions, host) {
+            function getCompletionsForPathMapping(path, patterns, fragment, packageDirectory, extensionOptions, host) {
                 if (!ts.endsWith(path, "*")) {
                     // For a path mapping "foo": ["/x/y/z.ts"], add "foo" itself as a completion.
-                    return !ts.stringContains(path, "*") ? justPathMappingName(path) : ts.emptyArray;
+                    return !ts.stringContains(path, "*") ? justPathMappingName(path, "script" /* scriptElement */) : ts.emptyArray;
                 }
                 var pathPrefix = path.slice(0, path.length - 1);
                 var remainingFragment = ts.tryRemovePrefix(fragment, pathPrefix);
                 if (remainingFragment === undefined) {
                     var starIsFullPathComponent = path[path.length - 2] === "/";
-                    return starIsFullPathComponent ? justPathMappingName(pathPrefix) : ts.flatMap(patterns, function (pattern) { var _a; return (_a = getModulesForPathsPattern("", baseUrl, pattern, fileExtensions, host)) === null || _a === void 0 ? void 0 : _a.map(function (_a) {
+                    return starIsFullPathComponent ? justPathMappingName(pathPrefix, "directory" /* directory */) : ts.flatMap(patterns, function (pattern) { var _a; return (_a = getModulesForPathsPattern("", packageDirectory, pattern, extensionOptions, host)) === null || _a === void 0 ? void 0 : _a.map(function (_a) {
                         var name = _a.name, rest = __rest(_a, ["name"]);
                         return (__assign({ name: pathPrefix + name }, rest));
                     }); });
                 }
-                return ts.flatMap(patterns, function (pattern) { return getModulesForPathsPattern(remainingFragment, baseUrl, pattern, fileExtensions, host); });
-                function justPathMappingName(name) {
-                    return ts.startsWith(name, fragment) ? [directoryResult(ts.removeTrailingDirectorySeparator(name))] : ts.emptyArray;
+                return ts.flatMap(patterns, function (pattern) { return getModulesForPathsPattern(remainingFragment, packageDirectory, pattern, extensionOptions, host); });
+                function justPathMappingName(name, kind) {
+                    return ts.startsWith(name, fragment) ? [{ name: ts.removeTrailingDirectorySeparator(name), kind: kind, extension: undefined }] : ts.emptyArray;
                 }
             }
-            function getModulesForPathsPattern(fragment, baseUrl, pattern, fileExtensions, host) {
+            function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensionOptions, host) {
                 if (!host.readDirectory) {
                     return undefined;
                 }
@@ -133618,21 +133659,33 @@ var ts;
                 var expandedPrefixDirectory = fragmentHasPath ? ts.combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
                 var normalizedSuffix = ts.normalizePath(parsed.suffix);
                 // Need to normalize after combining: If we combinePaths("a", "../b"), we want "b" and not "a/../b".
-                var baseDirectory = ts.normalizePath(ts.combinePaths(baseUrl, expandedPrefixDirectory));
+                var baseDirectory = ts.normalizePath(ts.combinePaths(packageDirectory, expandedPrefixDirectory));
                 var completePrefix = fragmentHasPath ? baseDirectory : ts.ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
-                // If we have a suffix, then we need to read the directory all the way down. We could create a glob
-                // that encodes the suffix, but we would have to escape the character "?" which readDirectory
-                // doesn't support. For now, this is safer but slower
-                var includeGlob = normalizedSuffix ? "**/*" : "./*";
-                var matches = ts.mapDefined(ts.tryReadDirectory(host, baseDirectory, fileExtensions, /*exclude*/ undefined, [includeGlob]), function (match) {
-                    var extension = ts.tryGetExtensionFromPath(match);
-                    var name = trimPrefixAndSuffix(match);
-                    return name === undefined ? undefined : nameAndKind(ts.removeFileExtension(name), "script" /* scriptElement */, extension);
-                });
-                var directories = ts.mapDefined(ts.tryGetDirectories(host, baseDirectory).map(function (d) { return ts.combinePaths(baseDirectory, d); }), function (dir) {
-                    var name = trimPrefixAndSuffix(dir);
-                    return name === undefined ? undefined : directoryResult(name);
+                // If we have a suffix, then we read the directory all the way down to avoid returning completions for
+                // directories that don't contain files that would match the suffix. A previous comment here was concerned
+                // about the case where `normalizedSuffix` includes a `?` character, which should be interpreted literally,
+                // but will match any single character as part of the `include` pattern in `tryReadDirectory`. This is not
+                // a problem, because (in the extremely unusual circumstance where the suffix has a `?` in it) a `?`
+                // interpreted as "any character" can only return *too many* results as compared to the literal
+                // interpretation, so we can filter those superfluous results out via `trimPrefixAndSuffix` as we've always
+                // done.
+                var includeGlob = normalizedSuffix ? "**/*" + normalizedSuffix : "./*";
+                var matches = ts.mapDefined(ts.tryReadDirectory(host, baseDirectory, extensionOptions.extensions, /*exclude*/ undefined, [includeGlob]), function (match) {
+                    var trimmedWithPattern = trimPrefixAndSuffix(match);
+                    if (trimmedWithPattern) {
+                        if (containsSlash(trimmedWithPattern)) {
+                            return directoryResult(ts.getPathComponents(removeLeadingDirectorySeparator(trimmedWithPattern))[1]);
+                        }
+                        var _a = getFilenameWithExtensionOption(trimmedWithPattern, host.getCompilationSettings(), extensionOptions.includeExtensionsOption), name = _a.name, extension = _a.extension;
+                        return nameAndKind(name, "script" /* scriptElement */, extension);
+                    }
                 });
+                // If we had a suffix, we already recursively searched for all possible files that could match
+                // it and returned the directories leading to those files. Otherwise, assume any directory could
+                // have something valid to import.
+                var directories = normalizedSuffix
+                    ? ts.emptyArray
+                    : ts.mapDefined(ts.tryGetDirectories(host, baseDirectory), function (dir) { return dir === "node_modules" ? undefined : directoryResult(dir); });
                 return __spreadArray(__spreadArray([], matches, true), directories, true);
                 function trimPrefixAndSuffix(path) {
                     var inner = withoutStartAndEnd(ts.normalizePath(path), completePrefix, normalizedSuffix);
@@ -133675,10 +133728,10 @@ var ts;
                 var names = kind === "path" ? getCompletionEntriesForDirectoryFragment(toComplete, scriptPath, getExtensionOptions(compilerOptions, 1 /* Include */), host, sourceFile.path)
                     : kind === "types" ? getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, getFragmentDirectory(toComplete), getExtensionOptions(compilerOptions))
                         : ts.Debug.fail();
-                return addReplacementSpans(toComplete, range.pos + prefix.length, names);
+                return addReplacementSpans(toComplete, range.pos + prefix.length, ts.arrayFrom(names.values()));
             }
             function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
-                if (result === void 0) { result = []; }
+                if (result === void 0) { result = createNameAndKindSet(); }
                 // Check for typings specified in compiler options
                 var seen = new ts.Map();
                 var typeRoots = ts.tryAndIgnoreErrors(function () { return ts.getEffectiveTypeRoots(options, host); }) || ts.emptyArray;
@@ -133703,7 +133756,7 @@ var ts;
                             continue;
                         if (fragmentDirectory === undefined) {
                             if (!seen.has(packageName)) {
-                                result.push(nameAndKind(packageName, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                                result.add(nameAndKind(packageName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                                 seen.set(packageName, true);
                             }
                         }
@@ -139304,7 +139357,7 @@ var ts;
                         result = references;
                         continue;
                     }
-                    var _loop_4 = function (entry) {
+                    var _loop_3 = function (entry) {
                         if (!entry.definition || entry.definition.type !== 0 /* Symbol */) {
                             result.push(entry);
                             return "continue";
@@ -139336,7 +139389,7 @@ var ts;
                     };
                     for (var _b = 0, references_2 = references; _b < references_2.length; _b++) {
                         var entry = references_2[_b];
-                        _loop_4(entry);
+                        _loop_3(entry);
                     }
                 }
                 return result;
@@ -140917,8 +140970,8 @@ var ts;
             var declarations;
             if (symbol && symbol.declarations) {
                 var indices = ts.indicesOf(symbol.declarations);
-                var keys_1 = ts.map(symbol.declarations, function (decl) { return ({ file: decl.getSourceFile().fileName, pos: decl.pos }); });
-                indices.sort(function (a, b) { return ts.compareStringsCaseSensitive(keys_1[a].file, keys_1[b].file) || keys_1[a].pos - keys_1[b].pos; });
+                var keys_2 = ts.map(symbol.declarations, function (decl) { return ({ file: decl.getSourceFile().fileName, pos: decl.pos }); });
+                indices.sort(function (a, b) { return ts.compareStringsCaseSensitive(keys_2[a].file, keys_2[b].file) || keys_2[a].pos - keys_2[b].pos; });
                 var sortedDeclarations = ts.map(indices, function (i) { return symbol.declarations[i]; });
                 var lastDecl = void 0;
                 for (var _i = 0, sortedDeclarations_1 = sortedDeclarations; _i < sortedDeclarations_1.length; _i++) {
@@ -141366,7 +141419,7 @@ var ts;
     }
     function updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName) {
         var allFiles = program.getSourceFiles();
-        var _loop_5 = function (sourceFile) {
+        var _loop_4 = function (sourceFile) {
             var newFromOld = oldToNew(sourceFile.fileName);
             var newImportFromPath = newFromOld !== null && newFromOld !== void 0 ? newFromOld : sourceFile.fileName;
             var newImportFromDirectory = ts.getDirectoryPath(newImportFromPath);
@@ -141398,7 +141451,7 @@ var ts;
         };
         for (var _i = 0, allFiles_1 = allFiles; _i < allFiles_1.length; _i++) {
             var sourceFile = allFiles_1[_i];
-            _loop_5(sourceFile);
+            _loop_4(sourceFile);
         }
     }
     function combineNormal(pathA, pathB) {
@@ -142422,7 +142475,7 @@ var ts;
             if (!patternMatcher)
                 return ts.emptyArray;
             var rawItems = [];
-            var _loop_6 = function (sourceFile) {
+            var _loop_5 = function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 if (excludeDtsFiles && sourceFile.isDeclarationFile) {
                     return "continue";
@@ -142434,7 +142487,7 @@ var ts;
             // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
             for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
                 var sourceFile = sourceFiles_4[_i];
-                _loop_6(sourceFile);
+                _loop_5(sourceFile);
             }
             rawItems.sort(compareNavigateToItems);
             return (maxResultCount === undefined ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
@@ -144497,13 +144550,13 @@ var ts;
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(str, value) {
         var n = str.length - value.length;
-        var _loop_7 = function (start) {
+        var _loop_6 = function (start) {
             if (every(value, function (valueChar, i) { return toLowerCase(str.charCodeAt(i + start)) === valueChar; })) {
                 return { value: start };
             }
         };
         for (var start = 0; start <= n; start++) {
-            var state_3 = _loop_7(start);
+            var state_3 = _loop_6(start);
             if (typeof state_3 === "object")
                 return state_3.value;
         }
@@ -145970,7 +146023,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile, checker, isManuallyInvoked) {
-            var _loop_8 = function (n) {
+            var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
                 ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
@@ -145980,7 +146033,7 @@ var ts;
                 }
             };
             for (var n = node; !ts.isSourceFile(n) && (isManuallyInvoked || !ts.isBlock(n)); n = n.parent) {
-                var state_4 = _loop_8(n);
+                var state_4 = _loop_7(n);
                 if (typeof state_4 === "object")
                     return state_4.value;
             }
@@ -147593,7 +147646,7 @@ var ts;
         commandLineOptionsStringToEnum = commandLineOptionsStringToEnum ||
             ts.filter(ts.optionDeclarations, function (o) { return typeof o.type === "object" && !ts.forEachEntry(o.type, function (v) { return typeof v !== "number"; }); });
         options = ts.cloneCompilerOptions(options);
-        var _loop_9 = function (opt) {
+        var _loop_8 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -147612,7 +147665,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_9(opt);
+            _loop_8(opt);
         }
         return options;
     }
@@ -151377,7 +151430,7 @@ var ts;
             ChangeTracker.prototype.finishDeleteDeclarations = function () {
                 var _this = this;
                 var deletedNodesInLists = new ts.Set(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`.
-                var _loop_10 = function (sourceFile, node) {
+                var _loop_9 = function (sourceFile, node) {
                     if (!this_1.deletedNodes.some(function (d) { return d.sourceFile === sourceFile && ts.rangeContainsRangeExclusive(d.node, node); })) {
                         if (ts.isArray(node)) {
                             this_1.deleteRange(sourceFile, ts.rangeOfTypeParameters(sourceFile, node));
@@ -151390,7 +151443,7 @@ var ts;
                 var this_1 = this;
                 for (var _i = 0, _a = this.deletedNodes; _i < _a.length; _i++) {
                     var _b = _a[_i], sourceFile = _b.sourceFile, node = _b.node;
-                    _loop_10(sourceFile, node);
+                    _loop_9(sourceFile, node);
                 }
                 deletedNodesInLists.forEach(function (node) {
                     var sourceFile = node.getSourceFile();
@@ -151478,14 +151531,14 @@ var ts;
                     // order changes by start position
                     // If the start position is the same, put the shorter range first, since an empty range (x, x) may precede (x, y) but not vice-versa.
                     var normalized = ts.stableSort(changesInFile, function (a, b) { return (a.range.pos - b.range.pos) || (a.range.end - b.range.end); });
-                    var _loop_11 = function (i) {
+                    var _loop_10 = function (i) {
                         ts.Debug.assert(normalized[i].range.end <= normalized[i + 1].range.pos, "Changes overlap", function () {
                             return JSON.stringify(normalized[i].range) + " and " + JSON.stringify(normalized[i + 1].range);
                         });
                     };
                     // verify that change intervals do not overlap, except possibly at end points.
                     for (var i = 0; i < normalized.length - 1; i++) {
-                        _loop_11(i);
+                        _loop_10(i);
                     }
                     var textChanges = ts.mapDefined(normalized, function (c) {
                         var span = ts.createTextSpanFromRange(c.range);
@@ -152393,7 +152446,7 @@ var ts;
             }
             var isCompleteFix = identifiers.isCompleteFix;
             var initializers;
-            var _loop_12 = function (identifier) {
+            var _loop_11 = function (identifier) {
                 var symbol = checker.getSymbolAtLocation(identifier);
                 if (!symbol) {
                     return "continue";
@@ -152426,7 +152479,7 @@ var ts;
             };
             for (var _i = 0, _a = identifiers.identifiers; _i < _a.length; _i++) {
                 var identifier = _a[_i];
-                _loop_12(identifier);
+                _loop_11(identifier);
             }
             return initializers && {
                 initializers: initializers,
@@ -153311,7 +153364,7 @@ var ts;
             }
             var pos = ts.skipTrivia(sourceFile.text, ts.moveRangePastModifiers(functionToConvert).pos);
             changes.insertModifierAt(sourceFile, pos, 131 /* AsyncKeyword */, { suffix: " " });
-            var _loop_13 = function (returnStatement) {
+            var _loop_12 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, node, transformer, /*hasContinuation*/ false);
@@ -153333,7 +153386,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                var state_5 = _loop_13(returnStatement);
+                var state_5 = _loop_12(returnStatement);
                 if (typeof state_5 === "object")
                     return state_5.value;
             }
@@ -156668,7 +156721,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, declaration) {
                         var supers = ts.isTypeLiteralNode(declaration) ? undefined : codefix.getAllSupers(declaration, checker);
-                        var _loop_14 = function (info) {
+                        var _loop_13 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers === null || supers === void 0 ? void 0 : supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -156695,7 +156748,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_14(info);
+                            _loop_13(info);
                         }
                     });
                 }));
@@ -159469,7 +159522,7 @@ var ts;
             function getSignatureFromCalls(calls) {
                 var parameters = [];
                 var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_15 = function (i) {
+                var _loop_14 = function (i) {
                     var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
                     symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
                     if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
@@ -159478,7 +159531,7 @@ var ts;
                     parameters.push(symbol);
                 };
                 for (var i = 0; i < length; i++) {
-                    _loop_15(i);
+                    _loop_14(i);
                 }
                 var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
                 return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
@@ -161454,7 +161507,7 @@ var ts;
             // Imports that need to be kept as named imports in the refactored code, to avoid changing the semantics.
             // More specifically, those are named imports that appear in named exports in the original code, e.g. `a` in `import { a } from "m"; export { a }`.
             var neededNamedImports = new ts.Set();
-            var _loop_16 = function (element) {
+            var _loop_15 = function (element) {
                 var propertyName = (element.propertyName || element.name).text;
                 ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     var access = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(namespaceImportName), propertyName);
@@ -161471,7 +161524,7 @@ var ts;
             };
             for (var _i = 0, _a = toConvert.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
-                _loop_16(element);
+                _loop_15(element);
             }
             changes.replaceNode(sourceFile, toConvert, shouldUseDefault
                 ? ts.factory.createIdentifier(namespaceImportName)
@@ -163362,7 +163415,7 @@ var ts;
                         : ts.getEnclosingBlockScopeContainer(scopes[0]);
                     ts.forEachChild(containingLexicalScopeOfExtraction, checkForUsedDeclarations);
                 }
-                var _loop_17 = function (i) {
+                var _loop_16 = function (i) {
                     var scopeUsages = usagesPerScope[i];
                     // Special case: in the innermost scope, all usages are available.
                     // (The computed value reflects the value at the top-level of the scope, but the
@@ -163405,7 +163458,7 @@ var ts;
                     }
                 };
                 for (var i = 0; i < scopes.length; i++) {
-                    _loop_17(i);
+                    _loop_16(i);
                 }
                 return { target: target, usagesPerScope: usagesPerScope, functionErrorsPerScope: functionErrorsPerScope, constantErrorsPerScope: constantErrorsPerScope, exposedVariableDeclarations: exposedVariableDeclarations };
                 function isInGenericContext(node) {
@@ -164106,10 +164159,10 @@ var ts;
         }
         function updateImportsInOtherFiles(changes, program, oldFile, movedSymbols, newModuleName) {
             var checker = program.getTypeChecker();
-            var _loop_18 = function (sourceFile) {
+            var _loop_17 = function (sourceFile) {
                 if (sourceFile === oldFile)
                     return "continue";
-                var _loop_19 = function (statement) {
+                var _loop_18 = function (statement) {
                     forEachImportInStatement(statement, function (importNode) {
                         if (checker.getSymbolAtLocation(moduleSpecifierFromImport(importNode)) !== oldFile.symbol)
                             return;
@@ -164131,12 +164184,12 @@ var ts;
                 };
                 for (var _b = 0, _c = sourceFile.statements; _b < _c.length; _b++) {
                     var statement = _c[_b];
-                    _loop_19(statement);
+                    _loop_18(statement);
                 }
             };
             for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                _loop_18(sourceFile);
+                _loop_17(sourceFile);
             }
         }
         function getNamespaceLikeImport(node) {
@@ -165499,7 +165552,7 @@ var ts;
                 var templateSpans = [];
                 var templateHead = ts.factory.createTemplateHead(headText, rawHeadText);
                 copyCommentFromStringLiterals(headIndexes, templateHead);
-                var _loop_20 = function (i) {
+                var _loop_19 = function (i) {
                     var currentNode = getExpressionFromParenthesesOrExpression(nodes[i]);
                     copyOperatorComments(i, currentNode);
                     var _c = concatConsecutiveString(i + 1, nodes), newIndex = _c[0], subsequentText = _c[1], rawSubsequentText = _c[2], stringIndexes = _c[3];
@@ -165528,7 +165581,7 @@ var ts;
                 };
                 var out_i_1;
                 for (var i = begin; i < nodes.length; i++) {
-                    _loop_20(i);
+                    _loop_19(i);
                     i = out_i_1;
                 }
                 return ts.factory.createTemplateExpression(templateHead, templateSpans);
@@ -166374,7 +166427,7 @@ var ts;
         var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations, checker);
         if (checker && (tags.length === 0 || declarations.some(hasJSDocInheritDocTag))) {
             var seenSymbols_1 = new ts.Set();
-            var _loop_21 = function (declaration) {
+            var _loop_20 = function (declaration) {
                 var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) {
                     var _a;
                     if (!seenSymbols_1.has(symbol)) {
@@ -166391,7 +166444,7 @@ var ts;
             };
             for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
                 var declaration = declarations_7[_i];
-                _loop_21(declaration);
+                _loop_20(declaration);
             }
         }
         return tags;
@@ -166402,7 +166455,7 @@ var ts;
         var doc = ts.JsDoc.getJsDocCommentsFromDeclarations(declarations, checker);
         if (checker && (doc.length === 0 || declarations.some(hasJSDocInheritDocTag))) {
             var seenSymbols_2 = new ts.Set();
-            var _loop_22 = function (declaration) {
+            var _loop_21 = function (declaration) {
                 var inheritedDocs = findBaseOfDeclaration(checker, declaration, function (symbol) {
                     if (!seenSymbols_2.has(symbol)) {
                         seenSymbols_2.add(symbol);
@@ -166418,7 +166471,7 @@ var ts;
             };
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                _loop_22(declaration);
+                _loop_21(declaration);
             }
         }
         return doc;