typescript 4.9.0-dev.20221006 → 4.9.0-dev.20221011

package/lib/tsserverlibrary.js

@@ -108,7 +108,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221006");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221011");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -59872,7 +59872,20 @@ var ts;
             return !!(ts.getObjectFlags(type) & 32 /* ObjectFlags.Mapped */ && getMappedTypeModifiers(type) & 4 /* MappedTypeModifiers.IncludeOptional */);
         }
         function isGenericMappedType(type) {
-            return !!(ts.getObjectFlags(type) & 32 /* ObjectFlags.Mapped */) && isGenericIndexType(getConstraintTypeFromMappedType(type));
+            if (ts.getObjectFlags(type) & 32 /* ObjectFlags.Mapped */) {
+                var constraint = getConstraintTypeFromMappedType(type);
+                if (isGenericIndexType(constraint)) {
+                    return true;
+                }
+                // A mapped type is generic if the 'as' clause references generic types other than the iteration type.
+                // To determine this, we substitute the constraint type (that we now know isn't generic) for the iteration
+                // type and check whether the resulting type is generic.
+                var nameType = getNameTypeFromMappedType(type);
+                if (nameType && isGenericIndexType(instantiateType(nameType, makeUnaryTypeMapper(getTypeParameterFromMappedType(type), constraint)))) {
+                    return true;
+                }
+            }
+            return false;
         }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
@@ -63192,8 +63205,14 @@ var ts;
                 return getStringLiteralType(text);
             }
             newTexts.push(text);
-            if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4 /* TypeFlags.String */); })) {
-                return stringType;
+            if (ts.every(newTexts, function (t) { return t === ""; })) {
+                if (ts.every(newTypes, function (t) { return !!(t.flags & 4 /* TypeFlags.String */); })) {
+                    return stringType;
+                }
+                // Normalize `${Mapping<xxx>}` into Mapping<xxx>
+                if (newTypes.length === 1 && isPatternLiteralType(newTypes[0])) {
+                    return newTypes[0];
+                }
             }
             var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
             var type = templateLiteralTypes.get(id);
@@ -63252,12 +63271,14 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 /* TypeFlags.Union */ | 131072 /* TypeFlags.Never */) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                // Mapping<Mapping<T>> === Mapping<T>
-                type.flags & 268435456 /* TypeFlags.StringMapping */ && symbol === type.symbol ? type :
-                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456 /* TypeFlags.StringMapping */) ? getTemplateLiteralType(["", ""], [type]) : type) :
-                        type.flags & 128 /* TypeFlags.StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                            type.flags & 134217728 /* TypeFlags.TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
-                                type;
+                type.flags & 128 /* TypeFlags.StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                    type.flags & 134217728 /* TypeFlags.TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                        // Mapping<Mapping<T>> === Mapping<T>
+                        type.flags & 268435456 /* TypeFlags.StringMapping */ && symbol === type.symbol ? type :
+                            type.flags & (1 /* TypeFlags.Any */ | 4 /* TypeFlags.String */ || type.flags & 268435456 /* TypeFlags.StringMapping */) || isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
+                                // This handles Mapping<`${number}`> and Mapping<`${bigint}`>
+                                isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, getTemplateLiteralType(["", ""], [type])) :
+                                    type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -63536,10 +63557,11 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 /* TypeFlags.Any */ | 4 /* TypeFlags.String */ | 8 /* TypeFlags.Number */ | 64 /* TypeFlags.BigInt */)) || !!(type.flags & 268435456 /* TypeFlags.StringMapping */ && isPatternLiteralPlaceholderType(type.type));
+            return !!(type.flags & (1 /* TypeFlags.Any */ | 4 /* TypeFlags.String */ | 8 /* TypeFlags.Number */ | 64 /* TypeFlags.BigInt */)) || isPatternLiteralType(type);
         }
         function isPatternLiteralType(type) {
-            return !!(type.flags & 134217728 /* TypeFlags.TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
+            return !!(type.flags & 134217728 /* TypeFlags.TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType) ||
+                !!(type.flags & 268435456 /* TypeFlags.StringMapping */) && isPatternLiteralPlaceholderType(type.type);
         }
         function isGenericType(type) {
             return !!getGenericObjectFlags(type);
@@ -69726,7 +69748,7 @@ var ts;
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
         function isMemberOfStringMapping(source, target) {
-            if (target.flags & (4 /* TypeFlags.String */ | 3 /* TypeFlags.AnyOrUnknown */)) {
+            if (target.flags & (4 /* TypeFlags.String */ | 1 /* TypeFlags.Any */)) {
                 return true;
             }
             if (target.flags & 134217728 /* TypeFlags.TemplateLiteral */) {
@@ -146632,8 +146654,8 @@ var ts;
                 }
                 if (ts.scanner.getToken() === 15 /* SyntaxKind.TemplateHead */) {
                     var stack = [ts.scanner.getToken()];
-                    var token = ts.scanner.scan();
                     loop: while (ts.length(stack)) {
+                        var token = ts.scanner.scan();
                         switch (token) {
                             case 1 /* SyntaxKind.EndOfFileToken */:
                                 break loop;
@@ -146661,7 +146683,6 @@ var ts;
                                 }
                                 break;
                         }
-                        token = ts.scanner.scan();
                     }
                     nextToken();
                 }
@@ -164150,7 +164171,6 @@ var ts;
                 var start = cursorRequest ? getExtractableParent(startToken) : ts.getParentNodeInSpan(startToken, sourceFile, adjustedSpan);
                 // Do the same for the ending position
                 var end = cursorRequest ? start : ts.getParentNodeInSpan(endToken, sourceFile, adjustedSpan);
-                var declarations = [];
                 // We'll modify these flags as we walk the tree to collect data
                 // about what things need to be done as part of the extraction.
                 var rangeFacts = RangeFacts.None;
@@ -164193,7 +164213,7 @@ var ts;
                         // the expression.
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
-                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations, thisNode: thisNode } };
+                    return { targetRange: { range: statements, facts: rangeFacts, thisNode: thisNode } };
                 }
                 if (ts.isReturnStatement(start) && !start.expression) {
                     // Makes no sense to extract an expression-less return statement.
@@ -164205,7 +164225,7 @@ var ts;
                 if (errors) {
                     return { errors: errors };
                 }
-                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations, thisNode: thisNode } }; // TODO: GH#18217
+                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, thisNode: thisNode } }; // TODO: GH#18217
                 /**
                  * Attempt to refine the extraction node (generally, by shrinking it) to produce better results.
                  * @param node The unrefined extraction node.
@@ -164217,10 +164237,10 @@ var ts;
                         }
                     }
                     else if (ts.isVariableStatement(node) || ts.isVariableDeclarationList(node)) {
-                        var declarations_6 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
+                        var declarations = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
                         var numInitializers = 0;
                         var lastInitializer = void 0;
-                        for (var _i = 0, declarations_5 = declarations_6; _i < declarations_5.length; _i++) {
+                        for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                             var declaration = declarations_5[_i];
                             if (declaration.initializer) {
                                 numInitializers++;
@@ -164320,7 +164340,6 @@ var ts;
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractExportedEntity));
                                 return true;
                             }
-                            declarations.push(node.symbol);
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
@@ -168366,8 +168385,8 @@ var ts;
                     tags = __spreadArray(__spreadArray([], inheritedTags, true), tags, true);
                 }
             };
-            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
-                var declaration = declarations_7[_i];
+            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                var declaration = declarations_6[_i];
                 _loop_20(declaration);
             }
         }
@@ -168393,8 +168412,8 @@ var ts;
                 if (inheritedDocs)
                     doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
             };
-            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
-                var declaration = declarations_8[_i];
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
                 _loop_21(declaration);
             }
         }
@@ -173043,6 +173062,7 @@ var ts;
                 this.watchOptions = watchOptions;
                 this.rootFiles = [];
                 this.rootFilesMap = new ts.Map();
+                /*@internal*/
                 this.plugins = [];
                 /*@internal*/
                 /**
@@ -173571,6 +173591,7 @@ var ts;
                 this.directoryStructureHost = undefined;
                 this.exportMapCache = undefined;
                 this.projectErrors = undefined;
+                this.plugins.length = 0;
                 // Clean up file watchers waiting for missing files
                 if (this.missingFilesMap) {
                     ts.clearMap(this.missingFilesMap, ts.closeFileWatcher);
@@ -174244,6 +174265,14 @@ var ts;
             Project.prototype.isSourceOfProjectReferenceRedirect = function (fileName) {
                 return !!this.program && this.program.isSourceOfProjectReferenceRedirect(fileName);
             };
+            /*@internal*/
+            Project.prototype.getGlobalPluginSearchPaths = function () {
+                // Search any globally-specified probe paths, then our peer node_modules
+                return __spreadArray(__spreadArray([], this.projectService.pluginProbeLocations, true), [
+                    // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/
+                    ts.combinePaths(this.projectService.getExecutingFilePath(), "../../.."),
+                ], false);
+            };
             Project.prototype.enableGlobalPlugins = function (options, pluginConfigOverrides) {
                 if (!this.projectService.globalPlugins.length)
                     return;
@@ -174252,11 +174281,8 @@ var ts;
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
-                // Search any globally-specified probe paths, then our peer node_modules
-                var searchPaths = __spreadArray(__spreadArray([], this.projectService.pluginProbeLocations, true), [
-                    // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/
-                    ts.combinePaths(this.projectService.getExecutingFilePath(), "../../.."),
-                ], false);
+                // Enable global plugins with synthetic configuration entries
+                var searchPaths = this.getGlobalPluginSearchPaths();
                 var _loop_1 = function (globalPluginName) {
                     // Skip empty names from odd commandline parses
                     if (!globalPluginName)
@@ -174269,7 +174295,6 @@ var ts;
                     this_1.enablePlugin({ name: globalPluginName, global: true }, searchPaths, pluginConfigOverrides);
                 };
                 var this_1 = this;
-                // Enable global plugins with synthetic configuration entries
                 for (var _i = 0, _a = this.projectService.globalPlugins; _i < _a.length; _i++) {
                     var globalPluginName = _a[_i];
                     _loop_1(globalPluginName);
@@ -175004,6 +175029,7 @@ var ts;
             /*@internal*/
             ConfiguredProject.prototype.enablePluginsWithOptions = function (options, pluginConfigOverrides) {
                 var _a;
+                this.plugins.length = 0;
                 if (!((_a = options.plugins) === null || _a === void 0 ? void 0 : _a.length) && !this.projectService.globalPlugins.length)
                     return;
                 var host = this.projectService.host;
@@ -175011,9 +175037,7 @@ var ts;
                     this.projectService.logger.info("Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded");
                     return;
                 }
-                // Search our peer node_modules, then any globally-specified probe paths
-                // ../../.. to walk from X/node_modules/typescript/lib/tsserver.js to X/node_modules/
-                var searchPaths = __spreadArray([ts.combinePaths(this.projectService.getExecutingFilePath(), "../../..")], this.projectService.pluginProbeLocations, true);
+                var searchPaths = this.getGlobalPluginSearchPaths();
                 if (this.projectService.allowLocalPluginLoads) {
                     var local = ts.getDirectoryPath(this.canonicalConfigFilePath);
                     this.projectService.logger.info("Local plugin loading enabled; adding ".concat(local, " to search paths"));
@@ -180724,6 +180748,7 @@ var ts;
                 var references = getReferencesWorker(projects, this.getDefaultProject(args), { fileName: args.file, pos: position }, this.logger);
                 if (!simplifiedResult)
                     return references;
+                var preferences = this.getPreferences(file);
                 var defaultProject = this.getDefaultProject(args);
                 var scriptInfo = defaultProject.getScriptInfoForNormalizedPath(file);
                 var nameInfo = defaultProject.getLanguageService().getQuickInfoAtPosition(file, position);
@@ -180732,7 +180757,7 @@ var ts;
                 var symbolStartOffset = nameSpan ? scriptInfo.positionToLineOffset(nameSpan.start).offset : 0;
                 var symbolName = nameSpan ? scriptInfo.getSnapshot().getText(nameSpan.start, ts.textSpanEnd(nameSpan)) : "";
                 var refs = ts.flatMap(references, function (referencedSymbol) {
-                    return referencedSymbol.references.map(function (entry) { return referenceEntryToReferencesResponseItem(_this.projectService, entry); });
+                    return referencedSymbol.references.map(function (entry) { return referenceEntryToReferencesResponseItem(_this.projectService, entry, preferences); });
                 });
                 return { refs: refs, symbolName: symbolName, symbolStartOffset: symbolStartOffset, symbolDisplayString: symbolDisplayString };
             };
@@ -180740,6 +180765,7 @@ var ts;
                 var _this = this;
                 var projects = this.getProjects(args);
                 var fileName = args.file;
+                var preferences = this.getPreferences(server.toNormalizedPath(fileName));
                 var references = [];
                 var seen = createDocumentSpanSet();
                 forEachProjectInProjects(projects, /*path*/ undefined, function (project) {
@@ -180758,7 +180784,7 @@ var ts;
                 });
                 if (!simplifiedResult)
                     return references;
-                var refs = references.map(function (entry) { return referenceEntryToReferencesResponseItem(_this.projectService, entry); });
+                var refs = references.map(function (entry) { return referenceEntryToReferencesResponseItem(_this.projectService, entry, preferences); });
                 return {
                     refs: refs,
                     symbolName: "\"".concat(args.file, "\"")
@@ -181822,14 +181848,18 @@ var ts;
             }
             return text;
         }
-        function referenceEntryToReferencesResponseItem(projectService, _a) {
+        function referenceEntryToReferencesResponseItem(projectService, _a, _b) {
             var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan, isWriteAccess = _a.isWriteAccess, isDefinition = _a.isDefinition;
+            var disableLineTextInReferences = _b.disableLineTextInReferences;
             var scriptInfo = ts.Debug.checkDefined(projectService.getScriptInfo(fileName));
             var span = toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo);
-            var lineSpan = scriptInfo.lineToTextSpan(span.start.line - 1);
-            var lineText = scriptInfo.getSnapshot().getText(lineSpan.start, ts.textSpanEnd(lineSpan)).replace(/\r|\n/g, "");
+            var lineText = disableLineTextInReferences ? undefined : getLineText(scriptInfo, span);
             return __assign(__assign({ file: fileName }, span), { lineText: lineText, isWriteAccess: isWriteAccess, isDefinition: isDefinition });
         }
+        function getLineText(scriptInfo, span) {
+            var lineSpan = scriptInfo.lineToTextSpan(span.start.line - 1);
+            return scriptInfo.getSnapshot().getText(lineSpan.start, ts.textSpanEnd(lineSpan)).replace(/\r|\n/g, "");
+        }
         function isCompletionEntryData(data) {
             return data === undefined || data && typeof data === "object"
                 && typeof data.exportName === "string"

package/lib/typescript.js

@@ -99,7 +99,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 = "".concat(ts.versionMajorMinor, ".0-dev.20221006");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221011");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -59863,7 +59863,20 @@ var ts;
             return !!(ts.getObjectFlags(type) & 32 /* ObjectFlags.Mapped */ && getMappedTypeModifiers(type) & 4 /* MappedTypeModifiers.IncludeOptional */);
         }
         function isGenericMappedType(type) {
-            return !!(ts.getObjectFlags(type) & 32 /* ObjectFlags.Mapped */) && isGenericIndexType(getConstraintTypeFromMappedType(type));
+            if (ts.getObjectFlags(type) & 32 /* ObjectFlags.Mapped */) {
+                var constraint = getConstraintTypeFromMappedType(type);
+                if (isGenericIndexType(constraint)) {
+                    return true;
+                }
+                // A mapped type is generic if the 'as' clause references generic types other than the iteration type.
+                // To determine this, we substitute the constraint type (that we now know isn't generic) for the iteration
+                // type and check whether the resulting type is generic.
+                var nameType = getNameTypeFromMappedType(type);
+                if (nameType && isGenericIndexType(instantiateType(nameType, makeUnaryTypeMapper(getTypeParameterFromMappedType(type), constraint)))) {
+                    return true;
+                }
+            }
+            return false;
         }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
@@ -63183,8 +63196,14 @@ var ts;
                 return getStringLiteralType(text);
             }
             newTexts.push(text);
-            if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4 /* TypeFlags.String */); })) {
-                return stringType;
+            if (ts.every(newTexts, function (t) { return t === ""; })) {
+                if (ts.every(newTypes, function (t) { return !!(t.flags & 4 /* TypeFlags.String */); })) {
+                    return stringType;
+                }
+                // Normalize `${Mapping<xxx>}` into Mapping<xxx>
+                if (newTypes.length === 1 && isPatternLiteralType(newTypes[0])) {
+                    return newTypes[0];
+                }
             }
             var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
             var type = templateLiteralTypes.get(id);
@@ -63243,12 +63262,14 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 /* TypeFlags.Union */ | 131072 /* TypeFlags.Never */) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                // Mapping<Mapping<T>> === Mapping<T>
-                type.flags & 268435456 /* TypeFlags.StringMapping */ && symbol === type.symbol ? type :
-                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456 /* TypeFlags.StringMapping */) ? getTemplateLiteralType(["", ""], [type]) : type) :
-                        type.flags & 128 /* TypeFlags.StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                            type.flags & 134217728 /* TypeFlags.TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
-                                type;
+                type.flags & 128 /* TypeFlags.StringLiteral */ ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                    type.flags & 134217728 /* TypeFlags.TemplateLiteral */ ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                        // Mapping<Mapping<T>> === Mapping<T>
+                        type.flags & 268435456 /* TypeFlags.StringMapping */ && symbol === type.symbol ? type :
+                            type.flags & (1 /* TypeFlags.Any */ | 4 /* TypeFlags.String */ || type.flags & 268435456 /* TypeFlags.StringMapping */) || isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
+                                // This handles Mapping<`${number}`> and Mapping<`${bigint}`>
+                                isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, getTemplateLiteralType(["", ""], [type])) :
+                                    type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -63527,10 +63548,11 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 /* TypeFlags.Any */ | 4 /* TypeFlags.String */ | 8 /* TypeFlags.Number */ | 64 /* TypeFlags.BigInt */)) || !!(type.flags & 268435456 /* TypeFlags.StringMapping */ && isPatternLiteralPlaceholderType(type.type));
+            return !!(type.flags & (1 /* TypeFlags.Any */ | 4 /* TypeFlags.String */ | 8 /* TypeFlags.Number */ | 64 /* TypeFlags.BigInt */)) || isPatternLiteralType(type);
         }
         function isPatternLiteralType(type) {
-            return !!(type.flags & 134217728 /* TypeFlags.TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
+            return !!(type.flags & 134217728 /* TypeFlags.TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType) ||
+                !!(type.flags & 268435456 /* TypeFlags.StringMapping */) && isPatternLiteralPlaceholderType(type.type);
         }
         function isGenericType(type) {
             return !!getGenericObjectFlags(type);
@@ -69717,7 +69739,7 @@ var ts;
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
         function isMemberOfStringMapping(source, target) {
-            if (target.flags & (4 /* TypeFlags.String */ | 3 /* TypeFlags.AnyOrUnknown */)) {
+            if (target.flags & (4 /* TypeFlags.String */ | 1 /* TypeFlags.Any */)) {
                 return true;
             }
             if (target.flags & 134217728 /* TypeFlags.TemplateLiteral */) {
@@ -146623,8 +146645,8 @@ var ts;
                 }
                 if (ts.scanner.getToken() === 15 /* SyntaxKind.TemplateHead */) {
                     var stack = [ts.scanner.getToken()];
-                    var token = ts.scanner.scan();
                     loop: while (ts.length(stack)) {
+                        var token = ts.scanner.scan();
                         switch (token) {
                             case 1 /* SyntaxKind.EndOfFileToken */:
                                 break loop;
@@ -146652,7 +146674,6 @@ var ts;
                                 }
                                 break;
                         }
-                        token = ts.scanner.scan();
                     }
                     nextToken();
                 }
@@ -164141,7 +164162,6 @@ var ts;
                 var start = cursorRequest ? getExtractableParent(startToken) : ts.getParentNodeInSpan(startToken, sourceFile, adjustedSpan);
                 // Do the same for the ending position
                 var end = cursorRequest ? start : ts.getParentNodeInSpan(endToken, sourceFile, adjustedSpan);
-                var declarations = [];
                 // We'll modify these flags as we walk the tree to collect data
                 // about what things need to be done as part of the extraction.
                 var rangeFacts = RangeFacts.None;
@@ -164184,7 +164204,7 @@ var ts;
                         // the expression.
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
-                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations, thisNode: thisNode } };
+                    return { targetRange: { range: statements, facts: rangeFacts, thisNode: thisNode } };
                 }
                 if (ts.isReturnStatement(start) && !start.expression) {
                     // Makes no sense to extract an expression-less return statement.
@@ -164196,7 +164216,7 @@ var ts;
                 if (errors) {
                     return { errors: errors };
                 }
-                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations, thisNode: thisNode } }; // TODO: GH#18217
+                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, thisNode: thisNode } }; // TODO: GH#18217
                 /**
                  * Attempt to refine the extraction node (generally, by shrinking it) to produce better results.
                  * @param node The unrefined extraction node.
@@ -164208,10 +164228,10 @@ var ts;
                         }
                     }
                     else if (ts.isVariableStatement(node) || ts.isVariableDeclarationList(node)) {
-                        var declarations_6 = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
+                        var declarations = ts.isVariableStatement(node) ? node.declarationList.declarations : node.declarations;
                         var numInitializers = 0;
                         var lastInitializer = void 0;
-                        for (var _i = 0, declarations_5 = declarations_6; _i < declarations_5.length; _i++) {
+                        for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                             var declaration = declarations_5[_i];
                             if (declaration.initializer) {
                                 numInitializers++;
@@ -164311,7 +164331,6 @@ var ts;
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractExportedEntity));
                                 return true;
                             }
-                            declarations.push(node.symbol);
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
@@ -168357,8 +168376,8 @@ var ts;
                     tags = __spreadArray(__spreadArray([], inheritedTags, true), tags, true);
                 }
             };
-            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
-                var declaration = declarations_7[_i];
+            for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                var declaration = declarations_6[_i];
                 _loop_20(declaration);
             }
         }
@@ -168384,8 +168403,8 @@ var ts;
                 if (inheritedDocs)
                     doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
             };
-            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
-                var declaration = declarations_8[_i];
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
                 _loop_21(declaration);
             }
         }