typescript 5.0.0-dev.20221201 → 5.0.0-dev.20221203

package/lib/typescript.js

@@ -42,7 +42,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.0";
-      version = `${versionMajorMinor}.0-dev.20221201`;
+      version = `${versionMajorMinor}.0-dev.20221203`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -17095,6 +17095,32 @@ ${lanes.join("\n")}
   function pseudoBigIntToString({ negative, base10Value }) {
     return (negative && base10Value !== "0" ? "-" : "") + base10Value;
   }
+  function parseBigInt(text) {
+    if (!isValidBigIntString(text, false)) {
+      return void 0;
+    }
+    return parseValidBigInt(text);
+  }
+  function parseValidBigInt(text) {
+    const negative = text.startsWith("-");
+    const base10Value = parsePseudoBigInt(`${negative ? text.slice(1) : text}n`);
+    return { negative, base10Value };
+  }
+  function isValidBigIntString(s, roundTripOnly) {
+    if (s === "")
+      return false;
+    const scanner2 = createScanner(99 /* ESNext */, false);
+    let success = true;
+    scanner2.setOnError(() => success = false);
+    scanner2.setText(s + "n");
+    let result = scanner2.scan();
+    const negative = result === 40 /* MinusToken */;
+    if (negative) {
+      result = scanner2.scan();
+    }
+    const flags = scanner2.getTokenFlags();
+    return success && result === 9 /* BigIntLiteral */ && scanner2.getTextPos() === s.length + 1 && !(flags & 512 /* ContainsSeparator */) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner2.getTokenValue()) }));
+  }
   function isValidTypeOnlyAliasUseSite(useSite) {
     return !!(useSite.flags & 16777216 /* Ambient */) || isPartOfTypeQuery(useSite) || isIdentifierInNonEmittingHeritageClause(useSite) || isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(useSite) || !(isExpressionNode(useSite) || isShorthandPropertyNameUseSite(useSite));
   }
@@ -17421,6 +17447,17 @@ ${lanes.join("\n")}
     const { isBracketed, typeExpression } = node;
     return isBracketed || !!typeExpression && typeExpression.type.kind === 319 /* JSDocOptionalType */;
   }
+  function canUsePropertyAccess(name, languageVersion) {
+    if (name.length === 0) {
+      return false;
+    }
+    const firstChar = name.charCodeAt(0);
+    return firstChar === 35 /* hash */ ? name.length > 1 && isIdentifierStart(name.charCodeAt(1), languageVersion) : isIdentifierStart(firstChar, languageVersion);
+  }
+  function hasTabstop(node) {
+    var _a2;
+    return ((_a2 = getSnippetElement(node)) == null ? void 0 : _a2.kind) === 0 /* TabStop */;
+  }
   var resolvingEmptyArray, externalHelpersModuleNameText, defaultMaximumTruncationLength, noTruncationMaximumTruncationLength, stringWriter, GetLiteralTextFlags, fullTripleSlashReferencePathRegEx, fullTripleSlashReferenceTypeReferenceDirectiveRegEx, fullTripleSlashAMDReferencePathRegEx, defaultLibReferenceRegEx, AssignmentKind, FunctionFlags, Associativity, OperatorPrecedence, templateSubstitutionRegExp, doubleQuoteEscapedCharsRegExp, singleQuoteEscapedCharsRegExp, backtickQuoteEscapedCharsRegExp, escapedCharsMap, nonAsciiCharacters, jsxDoubleQuoteEscapedCharsRegExp, jsxSingleQuoteEscapedCharsRegExp, jsxEscapedCharsMap, indentStrings, base64Digits, carriageReturnLineFeed, lineFeed, AccessKind, objectAllocator, localizedDiagnosticMessages, reservedCharacterPattern, wildcardCharCodes, commonPackageFolders, implicitExcludePathRegexPattern, filesMatcher, directoriesMatcher, excludeMatcher, wildcardMatchers, supportedTSExtensions, supportedTSExtensionsFlat, supportedTSExtensionsWithJson, supportedTSExtensionsForExtractExtension, supportedJSExtensions, supportedJSExtensionsFlat, allSupportedExtensions, allSupportedExtensionsWithJson, supportedDeclarationExtensions, supportedTSImplementationExtensions, extensionsToRemove, emptyFileSystemEntries;
   var init_utilities = __esm({
     "src/compiler/utilities.ts"() {
@@ -35262,41 +35299,86 @@ ${lanes.join("\n")}
     }
     return result;
   }
-  function createCacheWithRedirects(options) {
-    let ownMap = /* @__PURE__ */ new Map();
+  function compilerOptionValueToString(value) {
+    var _a2;
+    if (value === null || typeof value !== "object") {
+      return "" + value;
+    }
+    if (isArray(value)) {
+      return `[${(_a2 = value.map((e) => compilerOptionValueToString(e))) == null ? void 0 : _a2.join(",")}]`;
+    }
+    let str = "{";
+    for (const key in value) {
+      if (hasProperty(value, key)) {
+        str += `${key}: ${compilerOptionValueToString(value[key])}`;
+      }
+    }
+    return str + "}";
+  }
+  function getKeyForCompilerOptions(options, affectingOptionDeclarations) {
+    return affectingOptionDeclarations.map((option) => compilerOptionValueToString(getCompilerOptionValue(options, option))).join("|") + (options.pathsBasePath ? `|${options.pathsBasePath}` : void 0);
+  }
+  function createCacheWithRedirects(ownOptions) {
     const redirectsMap = /* @__PURE__ */ new Map();
+    const optionsToRedirectsKey = /* @__PURE__ */ new Map();
+    const redirectsKeyToMap = /* @__PURE__ */ new Map();
+    let ownMap = /* @__PURE__ */ new Map();
+    if (ownOptions)
+      redirectsMap.set(ownOptions, ownMap);
     return {
-      getOwnMap,
-      redirectsMap,
       getOrCreateMapOfCacheRedirects,
-      clear: clear2,
-      setOwnOptions,
-      setOwnMap
+      update,
+      clear: clear2
     };
-    function getOwnMap() {
-      return ownMap;
-    }
-    function setOwnOptions(newOptions) {
-      options = newOptions;
-    }
-    function setOwnMap(newOwnMap) {
-      ownMap = newOwnMap;
-    }
     function getOrCreateMapOfCacheRedirects(redirectedReference) {
-      if (!redirectedReference) {
-        return ownMap;
+      return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options) : ownMap;
+    }
+    function update(newOptions) {
+      if (ownOptions !== newOptions) {
+        if (ownOptions)
+          ownMap = getOrCreateMap(newOptions);
+        else
+          redirectsMap.set(newOptions, ownMap);
+        ownOptions = newOptions;
       }
-      const path = redirectedReference.sourceFile.path;
-      let redirects = redirectsMap.get(path);
-      if (!redirects) {
-        redirects = !options || optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? /* @__PURE__ */ new Map() : ownMap;
-        redirectsMap.set(path, redirects);
+    }
+    function getOrCreateMap(redirectOptions) {
+      let result = redirectsMap.get(redirectOptions);
+      if (result)
+        return result;
+      const key = getRedirectsCacheKey(redirectOptions);
+      result = redirectsKeyToMap.get(key);
+      if (!result) {
+        if (ownOptions) {
+          const ownKey = getRedirectsCacheKey(ownOptions);
+          if (ownKey === key)
+            result = ownMap;
+          else if (!redirectsKeyToMap.has(ownKey))
+            redirectsKeyToMap.set(ownKey, ownMap);
+        }
+        redirectsKeyToMap.set(key, result != null ? result : result = /* @__PURE__ */ new Map());
       }
-      return redirects;
+      redirectsMap.set(redirectOptions, result);
+      return result;
     }
     function clear2() {
+      const ownKey = ownOptions && optionsToRedirectsKey.get(ownOptions);
       ownMap.clear();
       redirectsMap.clear();
+      optionsToRedirectsKey.clear();
+      redirectsKeyToMap.clear();
+      if (ownOptions) {
+        if (ownKey)
+          optionsToRedirectsKey.set(ownOptions, ownKey);
+        redirectsMap.set(ownOptions, ownMap);
+      }
+    }
+    function getRedirectsCacheKey(options) {
+      let result = optionsToRedirectsKey.get(options);
+      if (!result) {
+        optionsToRedirectsKey.set(options, result = getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations));
+      }
+      return result;
     }
   }
   function createPackageJsonInfoCache(currentDirectory, getCanonicalFileName) {
@@ -35328,27 +35410,6 @@ ${lanes.join("\n")}
     }
     return result;
   }
-  function updateRedirectsMap(options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
-    if (!options.configFile)
-      return;
-    if (directoryToModuleNameMap.redirectsMap.size === 0) {
-      Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.redirectsMap.size === 0);
-      Debug.assert(directoryToModuleNameMap.getOwnMap().size === 0);
-      Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.getOwnMap().size === 0);
-      directoryToModuleNameMap.redirectsMap.set(options.configFile.path, directoryToModuleNameMap.getOwnMap());
-      moduleNameToDirectoryMap == null ? void 0 : moduleNameToDirectoryMap.redirectsMap.set(options.configFile.path, moduleNameToDirectoryMap.getOwnMap());
-    } else {
-      Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.redirectsMap.size > 0);
-      const ref = {
-        sourceFile: options.configFile,
-        commandLine: { options }
-      };
-      directoryToModuleNameMap.setOwnMap(directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
-      moduleNameToDirectoryMap == null ? void 0 : moduleNameToDirectoryMap.setOwnMap(moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
-    }
-    directoryToModuleNameMap.setOwnOptions(options);
-    moduleNameToDirectoryMap == null ? void 0 : moduleNameToDirectoryMap.setOwnOptions(options);
-  }
   function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap) {
     return {
       getOrCreateCacheForDirectory,
@@ -35359,13 +35420,16 @@ ${lanes.join("\n")}
       directoryToModuleNameMap.clear();
     }
     function update(options) {
-      updateRedirectsMap(options, directoryToModuleNameMap);
+      directoryToModuleNameMap.update(options);
     }
     function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
       const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
       return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, () => createModeAwareCache());
     }
   }
+  function createModeAwareCacheKey(specifier, mode) {
+    return mode === void 0 ? specifier : `${mode}|${specifier}`;
+  }
   function createModeAwareCache() {
     const underlying = /* @__PURE__ */ new Map();
     const memoizedReverseKeys = /* @__PURE__ */ new Map();
@@ -35396,7 +35460,7 @@ ${lanes.join("\n")}
     };
     return cache;
     function getUnderlyingCacheKey(specifier, mode) {
-      const result = mode === void 0 ? specifier : `${mode}|${specifier}`;
+      const result = createModeAwareCacheKey(specifier, mode);
       memoizedReverseKeys.set(result, [specifier, mode]);
       return result;
     }
@@ -35416,9 +35480,10 @@ ${lanes.join("\n")}
     }
     return map2;
   }
-  function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
-    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
-    moduleNameToDirectoryMap || (moduleNameToDirectoryMap = createCacheWithRedirects(options));
+  function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+    const directoryToModuleNameMap = createCacheWithRedirects(options);
+    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
+    const moduleNameToDirectoryMap = createCacheWithRedirects(options);
     const packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
     return {
       ...packageJsonInfoCache,
@@ -35438,11 +35503,12 @@ ${lanes.join("\n")}
       moduleNameToDirectoryMap.clear();
     }
     function update(options2) {
-      updateRedirectsMap(options2, directoryToModuleNameMap, moduleNameToDirectoryMap);
+      directoryToModuleNameMap.update(options2);
+      moduleNameToDirectoryMap.update(options2);
     }
     function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
       Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
-      return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === void 0 ? nonRelativeModuleName : `${mode}|${nonRelativeModuleName}`, createPerModuleNameCache);
+      return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, createModeAwareCacheKey(nonRelativeModuleName, mode), createPerModuleNameCache);
     }
     function createPerModuleNameCache() {
       const directoryPathMap = /* @__PURE__ */ new Map();
@@ -35490,8 +35556,9 @@ ${lanes.join("\n")}
       }
     }
   }
-  function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache, directoryToModuleNameMap) {
-    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
+  function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
+    const directoryToModuleNameMap = createCacheWithRedirects(options);
+    const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
     packageJsonInfoCache || (packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName));
     return {
       ...packageJsonInfoCache,
@@ -45171,7 +45238,7 @@ ${lanes.join("\n")}
         }
         const contextFile = getSourceFileOfNode(getOriginalNode(context.enclosingDeclaration));
         const resolutionMode = overrideImportMode || (contextFile == null ? void 0 : contextFile.impliedNodeFormat);
-        const cacheKey = getSpecifierCacheKey(contextFile.path, resolutionMode);
+        const cacheKey = createModeAwareCacheKey(contextFile.path, resolutionMode);
         const links = getSymbolLinks(symbol);
         let specifier = links.specifierCache && links.specifierCache.get(cacheKey);
         if (!specifier) {
@@ -45194,9 +45261,6 @@ ${lanes.join("\n")}
           links.specifierCache.set(cacheKey, specifier);
         }
         return specifier;
-        function getSpecifierCacheKey(path, mode) {
-          return mode === void 0 ? path : `${mode}|${path}`;
-        }
       }
       function symbolToEntityNameNode(symbol) {
         const identifier = factory.createIdentifier(unescapeLeadingUnderscores(symbol.escapedName));
@@ -45410,8 +45474,7 @@ ${lanes.join("\n")}
           if (isSingleOrDoubleQuote(firstChar) && some(symbol2.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
             return factory.createStringLiteral(getSpecifierForModuleSymbol(symbol2, context));
           }
-          const canUsePropertyAccess = firstChar === 35 /* hash */ ? symbolName2.length > 1 && isIdentifierStart(symbolName2.charCodeAt(1), languageVersion) : isIdentifierStart(firstChar, languageVersion);
-          if (index === 0 || canUsePropertyAccess) {
+          if (index === 0 || canUsePropertyAccess(symbolName2, languageVersion)) {
             const identifier = setEmitFlags(factory.createIdentifier(symbolName2, typeParameterNodes), 33554432 /* NoAsciiEscaping */);
             identifier.symbol = symbol2;
             return index > 0 ? factory.createPropertyAccessExpression(createExpressionFromSymbolChain(chain2, index - 1), identifier) : identifier;
@@ -57483,24 +57546,7 @@ ${lanes.join("\n")}
       return isFinite(n) && (!roundTripOnly || "" + n === s);
     }
     function parseBigIntLiteralType(text) {
-      const negative = text.startsWith("-");
-      const base10Value = parsePseudoBigInt(`${negative ? text.slice(1) : text}n`);
-      return getBigIntLiteralType({ negative, base10Value });
-    }
-    function isValidBigIntString(s, roundTripOnly) {
-      if (s === "")
-        return false;
-      const scanner2 = createScanner(99 /* ESNext */, false);
-      let success = true;
-      scanner2.setOnError(() => success = false);
-      scanner2.setText(s + "n");
-      let result = scanner2.scan();
-      const negative = result === 40 /* MinusToken */;
-      if (negative) {
-        result = scanner2.scan();
-      }
-      const flags = scanner2.getTokenFlags();
-      return success && result === 9 /* BigIntLiteral */ && scanner2.getTextPos() === s.length + 1 && !(flags & 512 /* ContainsSeparator */) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner2.getTokenValue()) }));
+      return getBigIntLiteralType(parseValidBigInt(text));
     }
     function isMemberOfStringMapping(source, target) {
       if (target.flags & (4 /* String */ | 1 /* Any */)) {
@@ -64972,11 +65018,11 @@ ${lanes.join("\n")}
     }
     function checkSatisfiesExpression(node) {
       checkSourceElement(node.type);
+      const exprType = checkExpression(node.expression);
       const targetType = getTypeFromTypeNode(node.type);
       if (isErrorType(targetType)) {
         return targetType;
       }
-      const exprType = checkExpression(node.expression);
       checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
       return exprType;
     }
@@ -100158,16 +100204,15 @@ ${lanes.join("\n")}
       return [];
     }
     const resolutions = [];
-    const cache = /* @__PURE__ */ new Map();
+    const cache = createModeAwareCache();
     for (const name of names) {
       let result;
       const mode = getModeForFileReference(name, containingFileMode);
       const strName = getResolutionName(name);
-      const cacheKey = mode !== void 0 ? `${mode}|${strName}` : strName;
-      if (cache.has(cacheKey)) {
-        result = cache.get(cacheKey);
+      if (cache.has(strName, mode)) {
+        result = cache.get(strName, mode);
       } else {
-        cache.set(cacheKey, result = loader(strName, containingFile, redirectedReference, mode));
+        cache.set(strName, mode, result = loader(strName, containingFile, redirectedReference, mode));
       }
       resolutions.push(result);
     }
@@ -100243,18 +100288,17 @@ ${lanes.join("\n")}
       return [];
     }
     const resolutions = [];
-    const cache = /* @__PURE__ */ new Map();
+    const cache = createModeAwareCache();
     let i = 0;
     for (const entry of resolutionInfo ? resolutionInfo.names : names) {
       let result;
       const mode = !isString(entry) ? getModeForUsageLocation(containingFile, entry) : getModeForResolutionAtIndex(containingFile, i);
       i++;
       const name = isString(entry) ? entry : entry.text;
-      const cacheKey = mode !== void 0 ? `${mode}|${name}` : name;
-      if (cache.has(cacheKey)) {
-        result = cache.get(cacheKey);
+      if (cache.has(name, mode)) {
+        result = cache.get(name, mode);
       } else {
-        cache.set(cacheKey, result = loader(name, mode, containingFileName, redirectedReference));
+        cache.set(name, mode, result = loader(name, mode, containingFileName, redirectedReference));
       }
       resolutions.push(result);
     }
@@ -104830,23 +104874,17 @@ ${lanes.join("\n")}
     const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
     const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
     const resolvedModuleNames = /* @__PURE__ */ new Map();
-    const perDirectoryResolvedModuleNames = createCacheWithRedirects();
-    const nonRelativeModuleNameCache = createCacheWithRedirects();
     const moduleResolutionCache = createModuleResolutionCache(
       getCurrentDirectory(),
       resolutionHost.getCanonicalFileName,
-      void 0,
-      perDirectoryResolvedModuleNames,
-      nonRelativeModuleNameCache
+      resolutionHost.getCompilationSettings()
     );
     const resolvedTypeReferenceDirectives = /* @__PURE__ */ new Map();
-    const perDirectoryResolvedTypeReferenceDirectives = createCacheWithRedirects();
     const typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(
       getCurrentDirectory(),
       resolutionHost.getCanonicalFileName,
-      void 0,
-      moduleResolutionCache.getPackageJsonInfoCache(),
-      perDirectoryResolvedTypeReferenceDirectives
+      resolutionHost.getCompilationSettings(),
+      moduleResolutionCache.getPackageJsonInfoCache()
     );
     const failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
     const customFailedLookupPaths = /* @__PURE__ */ new Map();
@@ -104907,6 +104945,8 @@ ${lanes.join("\n")}
       affectingPathChecksForFile = void 0;
       moduleResolutionCache.clear();
       typeReferenceDirectiveResolutionCache.clear();
+      moduleResolutionCache.update(resolutionHost.getCompilationSettings());
+      typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
       impliedFormatPackageJsons.clear();
       hasChangedAutomaticTypeDirectiveNames = false;
     }
@@ -105011,8 +105051,7 @@ ${lanes.join("\n")}
       names,
       containingFile,
       redirectedReference,
-      cache,
-      perDirectoryCacheWithRedirects,
+      perFileCache,
       loader,
       getResolutionWithResolvedFileName,
       shouldRetryResolution,
@@ -105022,16 +105061,9 @@ ${lanes.join("\n")}
       containingSourceFile,
       containingSourceFileMode
     }) {
-      var _a2, _b, _c, _d;
+      var _a2, _b, _c;
       const path = resolutionHost.toPath(containingFile);
-      const resolutionsInFile = cache.get(path) || cache.set(path, createModeAwareCache()).get(path);
-      const dirPath = getDirectoryPath(path);
-      const perDirectoryCache = perDirectoryCacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
-      let perDirectoryResolution = perDirectoryCache.get(dirPath);
-      if (!perDirectoryResolution) {
-        perDirectoryResolution = createModeAwareCache();
-        perDirectoryCache.set(dirPath, perDirectoryResolution);
-      }
+      const resolutionsInFile = perFileCache.get(path) || perFileCache.set(path, createModeAwareCache()).get(path);
       const resolvedModules = [];
       const compilerOptions = resolutionHost.getCompilationSettings();
       const hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
@@ -105047,28 +105079,9 @@ ${lanes.join("\n")}
         let resolution = resolutionsInFile.get(name, mode);
         if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
           const existingResolution = resolution;
-          const resolutionInDirectory = perDirectoryResolution.get(name, mode);
-          if (resolutionInDirectory) {
-            resolution = resolutionInDirectory;
-            const host = ((_a2 = resolutionHost.getCompilerHost) == null ? void 0 : _a2.call(resolutionHost)) || resolutionHost;
-            if (isTraceEnabled(compilerOptions, host)) {
-              const resolved = getResolutionWithResolvedFileName(resolution);
-              trace(
-                host,
-                loader === resolveModuleName2 ? (resolved == null ? void 0 : resolved.resolvedFileName) ? resolved.packageId ? Diagnostics.Reusing_resolution_of_module_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3_with_Package_ID_4 : Diagnostics.Reusing_resolution_of_module_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3 : Diagnostics.Reusing_resolution_of_module_0_from_1_found_in_cache_from_location_2_it_was_not_resolved : (resolved == null ? void 0 : resolved.resolvedFileName) ? resolved.packageId ? Diagnostics.Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3_with_Package_ID_4 : Diagnostics.Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3 : Diagnostics.Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_resolved,
-                name,
-                containingFile,
-                getDirectoryPath(containingFile),
-                resolved == null ? void 0 : resolved.resolvedFileName,
-                (resolved == null ? void 0 : resolved.packageId) && packageIdToString(resolved.packageId)
-              );
-            }
-          } else {
-            resolution = loader(name, containingFile, compilerOptions, ((_b = resolutionHost.getCompilerHost) == null ? void 0 : _b.call(resolutionHost)) || resolutionHost, redirectedReference, containingSourceFile, mode);
-            perDirectoryResolution.set(name, mode, resolution);
-            if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
-              resolutionHost.onDiscoveredSymlink();
-            }
+          resolution = loader(name, containingFile, compilerOptions, ((_a2 = resolutionHost.getCompilerHost) == null ? void 0 : _a2.call(resolutionHost)) || resolutionHost, redirectedReference, containingSourceFile, mode);
+          if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
+            resolutionHost.onDiscoveredSymlink();
           }
           resolutionsInFile.set(name, mode, resolution);
           watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
@@ -105080,7 +105093,7 @@ ${lanes.join("\n")}
             logChanges = false;
           }
         } else {
-          const host = ((_c = resolutionHost.getCompilerHost) == null ? void 0 : _c.call(resolutionHost)) || resolutionHost;
+          const host = ((_b = resolutionHost.getCompilerHost) == null ? void 0 : _b.call(resolutionHost)) || resolutionHost;
           if (isTraceEnabled(compilerOptions, host) && !seenNamesInFile.has(name, mode)) {
             const resolved = getResolutionWithResolvedFileName(resolution);
             trace(
@@ -105098,7 +105111,7 @@ ${lanes.join("\n")}
         resolvedModules.push(getResolutionWithResolvedFileName(resolution));
       }
       if (resolutionInfo && (loader === resolveTypeReferenceDirective2 || containingSourceFile)) {
-        (_d = resolutionInfo.reusedNames) == null ? void 0 : _d.forEach((entry) => seenNamesInFile.set(
+        (_c = resolutionInfo.reusedNames) == null ? void 0 : _c.forEach((entry) => seenNamesInFile.set(
           getResolutionName(entry),
           !isString(entry) && isStringLiteralLike(entry) ? getModeForUsageLocation(containingSourceFile, entry) : getModeForFileReference(entry, containingSourceFileMode),
           true
@@ -105137,8 +105150,7 @@ ${lanes.join("\n")}
         names: typeDirectiveNames,
         containingFile,
         redirectedReference,
-        cache: resolvedTypeReferenceDirectives,
-        perDirectoryCacheWithRedirects: perDirectoryResolvedTypeReferenceDirectives,
+        perFileCache: resolvedTypeReferenceDirectives,
         loader: resolveTypeReferenceDirective2,
         getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective2,
         shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0,
@@ -105151,8 +105163,7 @@ ${lanes.join("\n")}
         names: moduleNames,
         containingFile,
         redirectedReference,
-        cache: resolvedModuleNames,
-        perDirectoryCacheWithRedirects: perDirectoryResolvedModuleNames,
+        perFileCache: resolvedModuleNames,
         loader: resolveModuleName2,
         getResolutionWithResolvedFileName: getResolvedModule2,
         shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
@@ -113920,24 +113931,8 @@ ${lanes.join("\n")}
       getKeyForCompilationSettings
     };
   }
-  function compilerOptionValueToString(value) {
-    var _a2;
-    if (value === null || typeof value !== "object") {
-      return "" + value;
-    }
-    if (isArray(value)) {
-      return `[${(_a2 = map(value, (e) => compilerOptionValueToString(e))) == null ? void 0 : _a2.join(",")}]`;
-    }
-    let str = "{";
-    for (const key in value) {
-      if (hasProperty(value, key)) {
-        str += `${key}: ${compilerOptionValueToString(value[key])}`;
-      }
-    }
-    return str + "}";
-  }
   function getKeyForCompilationSettings(settings) {
-    return sourceFileAffectingCompilerOptions.map((option) => compilerOptionValueToString(getCompilerOptionValue(settings, option))).join("|") + (settings.pathsBasePath ? `|${settings.pathsBasePath}` : void 0);
+    return getKeyForCompilerOptions(settings, sourceFileAffectingCompilerOptions);
   }
   function getDocumentRegistryBucketKeyWithMode(key, mode) {
     return mode ? `${key}|${mode}` : key;
@@ -116135,6 +116130,9 @@ ${lanes.join("\n")}
       const textPos = scanner.getTextPos();
       if (textPos <= end) {
         if (token === 79 /* Identifier */) {
+          if (hasTabstop(parent2)) {
+            continue;
+          }
           Debug.fail(`Did not expect ${Debug.formatSyntaxKind(parent2.kind)} to have an Identifier in its trivia`);
         }
         nodes.push(createNode(token, pos, textPos, parent2));
@@ -129576,6 +129574,13 @@ ${lanes.join("\n")}
     if (!isChecked) {
       getJSCompletionEntries(sourceFile, location.pos, uniqueNames, getEmitScriptTarget(compilerOptions), entries);
     }
+    let caseBlock;
+    if (preferences.includeCompletionsWithInsertText && contextToken && (caseBlock = findAncestor(contextToken, isCaseBlock))) {
+      const cases = getExhaustiveCaseSnippets(caseBlock, sourceFile, preferences, compilerOptions, host, program, formatContext);
+      if (cases) {
+        entries.push(cases.entry);
+      }
+    }
     return {
       flags: completionData.flags,
       isGlobalCompletion: isInSnippetScope,
@@ -129589,6 +129594,187 @@ ${lanes.join("\n")}
   function isCheckedFile(sourceFile, compilerOptions) {
     return !isSourceFileJS(sourceFile) || !!isCheckJsEnabledForFile(sourceFile, compilerOptions);
   }
+  function getExhaustiveCaseSnippets(caseBlock, sourceFile, preferences, options, host, program, formatContext) {
+    const clauses = caseBlock.clauses;
+    const checker = program.getTypeChecker();
+    const switchType = checker.getTypeAtLocation(caseBlock.parent.expression);
+    if (switchType && switchType.isUnion() && every(switchType.types, (type) => type.isLiteral())) {
+      const tracker = newCaseClauseTracker(checker, clauses);
+      const target = getEmitScriptTarget(options);
+      const quotePreference = getQuotePreference(sourceFile, preferences);
+      const importAdder = ts_codefix_exports.createImportAdder(sourceFile, program, preferences, host);
+      const elements = [];
+      for (const type of switchType.types) {
+        if (type.flags & 1024 /* EnumLiteral */) {
+          Debug.assert(type.symbol, "An enum member type should have a symbol");
+          Debug.assert(type.symbol.parent, "An enum member type should have a parent symbol (the enum symbol)");
+          const enumValue = type.symbol.valueDeclaration && checker.getConstantValue(type.symbol.valueDeclaration);
+          if (enumValue !== void 0) {
+            if (tracker.hasValue(enumValue)) {
+              continue;
+            }
+            tracker.addValue(enumValue);
+          }
+          const typeNode = ts_codefix_exports.typeToAutoImportableTypeNode(checker, importAdder, type, caseBlock, target);
+          if (!typeNode) {
+            return void 0;
+          }
+          const expr = typeNodeToExpression(typeNode, target, quotePreference);
+          if (!expr) {
+            return void 0;
+          }
+          elements.push(expr);
+        } else if (!tracker.hasValue(type.value)) {
+          switch (typeof type.value) {
+            case "object":
+              elements.push(factory.createBigIntLiteral(type.value));
+              break;
+            case "number":
+              elements.push(factory.createNumericLiteral(type.value));
+              break;
+            case "string":
+              elements.push(factory.createStringLiteral(type.value));
+              break;
+          }
+        }
+      }
+      if (elements.length === 0) {
+        return void 0;
+      }
+      const newClauses = map(elements, (element) => factory.createCaseClause(element, []));
+      const newLineChar = getNewLineCharacter(options, maybeBind(host, host.getNewLine));
+      const printer = createSnippetPrinter({
+        removeComments: true,
+        module: options.module,
+        target: options.target,
+        newLine: getNewLineKind(newLineChar)
+      });
+      const printNode = formatContext ? (node) => printer.printAndFormatNode(4 /* Unspecified */, node, sourceFile, formatContext) : (node) => printer.printNode(4 /* Unspecified */, node, sourceFile);
+      const insertText = map(newClauses, (clause, i) => {
+        if (preferences.includeCompletionsWithSnippetText) {
+          return `${printNode(clause)}$${i + 1}`;
+        }
+        return `${printNode(clause)}`;
+      }).join(newLineChar);
+      const firstClause = printer.printNode(4 /* Unspecified */, newClauses[0], sourceFile);
+      return {
+        entry: {
+          name: `${firstClause} ...`,
+          kind: "" /* unknown */,
+          sortText: SortText.GlobalsOrKeywords,
+          insertText,
+          hasAction: importAdder.hasFixes() || void 0,
+          source: "SwitchCases/" /* SwitchCases */,
+          isSnippet: preferences.includeCompletionsWithSnippetText ? true : void 0
+        },
+        importAdder
+      };
+    }
+    return void 0;
+  }
+  function newCaseClauseTracker(checker, clauses) {
+    const existingStrings = /* @__PURE__ */ new Set();
+    const existingNumbers = /* @__PURE__ */ new Set();
+    const existingBigInts = /* @__PURE__ */ new Set();
+    for (const clause of clauses) {
+      if (!isDefaultClause(clause)) {
+        if (isLiteralExpression(clause.expression)) {
+          const expression = clause.expression;
+          switch (expression.kind) {
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 10 /* StringLiteral */:
+              existingStrings.add(expression.text);
+              break;
+            case 8 /* NumericLiteral */:
+              existingNumbers.add(parseInt(expression.text));
+              break;
+            case 9 /* BigIntLiteral */:
+              const parsedBigInt = parseBigInt(endsWith(expression.text, "n") ? expression.text.slice(0, -1) : expression.text);
+              if (parsedBigInt) {
+                existingBigInts.add(pseudoBigIntToString(parsedBigInt));
+              }
+              break;
+          }
+        } else {
+          const symbol = checker.getSymbolAtLocation(clause.expression);
+          if (symbol && symbol.valueDeclaration && isEnumMember(symbol.valueDeclaration)) {
+            const enumValue = checker.getConstantValue(symbol.valueDeclaration);
+            if (enumValue !== void 0) {
+              addValue(enumValue);
+            }
+          }
+        }
+      }
+    }
+    return {
+      addValue,
+      hasValue
+    };
+    function addValue(value) {
+      switch (typeof value) {
+        case "string":
+          existingStrings.add(value);
+          break;
+        case "number":
+          existingNumbers.add(value);
+      }
+    }
+    function hasValue(value) {
+      switch (typeof value) {
+        case "string":
+          return existingStrings.has(value);
+        case "number":
+          return existingNumbers.has(value);
+        case "object":
+          return existingBigInts.has(pseudoBigIntToString(value));
+      }
+    }
+  }
+  function typeNodeToExpression(typeNode, languageVersion, quotePreference) {
+    switch (typeNode.kind) {
+      case 180 /* TypeReference */:
+        const typeName = typeNode.typeName;
+        return entityNameToExpression(typeName, languageVersion, quotePreference);
+      case 196 /* IndexedAccessType */:
+        const objectExpression = typeNodeToExpression(typeNode.objectType, languageVersion, quotePreference);
+        const indexExpression = typeNodeToExpression(typeNode.indexType, languageVersion, quotePreference);
+        return objectExpression && indexExpression && factory.createElementAccessExpression(objectExpression, indexExpression);
+      case 198 /* LiteralType */:
+        const literal = typeNode.literal;
+        switch (literal.kind) {
+          case 10 /* StringLiteral */:
+            return factory.createStringLiteral(literal.text, quotePreference === 0 /* Single */);
+          case 8 /* NumericLiteral */:
+            return factory.createNumericLiteral(literal.text, literal.numericLiteralFlags);
+        }
+        return void 0;
+      case 193 /* ParenthesizedType */:
+        const exp = typeNodeToExpression(typeNode.type, languageVersion, quotePreference);
+        return exp && (isIdentifier(exp) ? exp : factory.createParenthesizedExpression(exp));
+      case 183 /* TypeQuery */:
+        return entityNameToExpression(typeNode.exprName, languageVersion, quotePreference);
+      case 202 /* ImportType */:
+        Debug.fail(`We should not get an import type after calling 'codefix.typeToAutoImportableTypeNode'.`);
+    }
+    return void 0;
+  }
+  function entityNameToExpression(entityName, languageVersion, quotePreference) {
+    if (isIdentifier(entityName)) {
+      return entityName;
+    }
+    const unescapedName = unescapeLeadingUnderscores(entityName.right.escapedText);
+    if (canUsePropertyAccess(unescapedName, languageVersion)) {
+      return factory.createPropertyAccessExpression(
+        entityNameToExpression(entityName.left, languageVersion, quotePreference),
+        unescapedName
+      );
+    } else {
+      return factory.createElementAccessExpression(
+        entityNameToExpression(entityName.left, languageVersion, quotePreference),
+        factory.createStringLiteral(unescapedName, quotePreference === 0 /* Single */)
+      );
+    }
+  }
   function isMemberCompletionKind(kind) {
     switch (kind) {
       case CompletionKind.ObjectPropertyDeclaration:
@@ -129995,7 +130181,9 @@ ${lanes.join("\n")}
     };
     return {
       printSnippetList,
-      printAndFormatSnippetList
+      printAndFormatSnippetList,
+      printNode,
+      printAndFormatNode
     };
     function escapingWrite(s, write) {
       const escaped = escapeSnippetText(s);
@@ -130044,6 +130232,40 @@ ${lanes.join("\n")}
       const allChanges = escapes ? stableSort(concatenate(changes, escapes), (a, b) => compareTextSpans(a.span, b.span)) : changes;
       return ts_textChanges_exports.applyChanges(syntheticFile.text, allChanges);
     }
+    function printNode(hint, node, sourceFile) {
+      const unescaped = printUnescapedNode(hint, node, sourceFile);
+      return escapes ? ts_textChanges_exports.applyChanges(unescaped, escapes) : unescaped;
+    }
+    function printUnescapedNode(hint, node, sourceFile) {
+      escapes = void 0;
+      writer.clear();
+      printer.writeNode(hint, node, sourceFile, writer);
+      return writer.getText();
+    }
+    function printAndFormatNode(hint, node, sourceFile, formatContext) {
+      const syntheticFile = {
+        text: printUnescapedNode(
+          hint,
+          node,
+          sourceFile
+        ),
+        getLineAndCharacterOfPosition(pos) {
+          return getLineAndCharacterOfPosition(this, pos);
+        }
+      };
+      const formatOptions = getFormatCodeSettingsForWriting(formatContext, sourceFile);
+      const nodeWithPos = ts_textChanges_exports.assignPositionsToNode(node);
+      const changes = ts_formatting_exports.formatNodeGivenIndentation(
+        nodeWithPos,
+        syntheticFile,
+        sourceFile.languageVariant,
+        0,
+        0,
+        { ...formatContext, options: formatOptions }
+      );
+      const allChanges = escapes ? stableSort(concatenate(changes, escapes), (a, b) => compareTextSpans(a.span, b.span)) : changes;
+      return ts_textChanges_exports.applyChanges(syntheticFile.text, allChanges);
+    }
   }
   function originToCompletionEntryData(origin) {
     const ambientModuleName = origin.fileName ? void 0 : stripQuotes(origin.moduleSymbol.name);
@@ -130247,6 +130469,9 @@ ${lanes.join("\n")}
     return entries;
   }
   function getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host, preferences) {
+    if (entryId.source === "SwitchCases/" /* SwitchCases */) {
+      return { type: "cases" };
+    }
     if (entryId.data) {
       const autoImport = getAutoImportSymbolFromCompletionEntryData(entryId.name, entryId.data, program, host);
       if (autoImport) {
@@ -130285,9 +130510,9 @@ ${lanes.join("\n")}
     const typeChecker = program.getTypeChecker();
     const compilerOptions = program.getCompilerOptions();
     const { name, source, data } = entryId;
-    const contextToken = findPrecedingToken(position, sourceFile);
-    if (isInString(sourceFile, position, contextToken)) {
-      return ts_Completions_StringCompletions_exports.getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, typeChecker, compilerOptions, host, cancellationToken, preferences);
+    const { previousToken, contextToken } = getRelevantTokens(position, sourceFile);
+    if (isInString(sourceFile, position, previousToken)) {
+      return ts_Completions_StringCompletions_exports.getStringLiteralCompletionDetails(name, sourceFile, position, previousToken, typeChecker, compilerOptions, host, cancellationToken, preferences);
     }
     const symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host, preferences);
     switch (symbolCompletion.type) {
@@ -130307,14 +130532,49 @@ ${lanes.join("\n")}
         }
       }
       case "symbol": {
-        const { symbol, location, contextToken: contextToken2, origin, previousToken } = symbolCompletion;
-        const { codeActions, sourceDisplay } = getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken2, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken);
+        const { symbol, location, contextToken: contextToken2, origin, previousToken: previousToken2 } = symbolCompletion;
+        const { codeActions, sourceDisplay } = getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken2, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken2, formatContext, preferences, data, source, cancellationToken);
         return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay);
       }
       case "literal": {
         const { literal } = symbolCompletion;
         return createSimpleDetails(completionNameForLiteral(sourceFile, preferences, literal), "string" /* string */, typeof literal === "string" ? 8 /* stringLiteral */ : 7 /* numericLiteral */);
       }
+      case "cases": {
+        const { entry, importAdder } = getExhaustiveCaseSnippets(
+          contextToken.parent,
+          sourceFile,
+          preferences,
+          program.getCompilerOptions(),
+          host,
+          program,
+          void 0
+        );
+        if (importAdder.hasFixes()) {
+          const changes = ts_textChanges_exports.ChangeTracker.with(
+            { host, formatContext, preferences },
+            importAdder.writeFixes
+          );
+          return {
+            name: entry.name,
+            kind: "" /* unknown */,
+            kindModifiers: "",
+            displayParts: [],
+            sourceDisplay: void 0,
+            codeActions: [{
+              changes,
+              description: diagnosticToString([Diagnostics.Includes_imports_of_types_referenced_by_0, name])
+            }]
+          };
+        }
+        return {
+          name: entry.name,
+          kind: "" /* unknown */,
+          kindModifiers: "",
+          displayParts: [],
+          sourceDisplay: void 0
+        };
+      }
       case "none":
         return allKeywordsCompletions().some((c) => c.name === name) ? createSimpleDetails(name, "keyword" /* keyword */, 5 /* keyword */) : void 0;
       default:
@@ -132201,6 +132461,7 @@ ${lanes.join("\n")}
         CompletionSource2["ClassMemberSnippet"] = "ClassMemberSnippet/";
         CompletionSource2["TypeOnlyAlias"] = "TypeOnlyAlias/";
         CompletionSource2["ObjectLiteralMethodSnippet"] = "ObjectLiteralMethodSnippet/";
+        CompletionSource2["SwitchCases"] = "SwitchCases/";
         return CompletionSource2;
       })(CompletionSource || {});
       SymbolOriginInfoKind = /* @__PURE__ */ ((SymbolOriginInfoKind2) => {
@@ -137515,12 +137776,14 @@ ${lanes.join("\n")}
     if (!selection || !isTypeNode(selection))
       return { error: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_type_node) };
     const checker = context.program.getTypeChecker();
-    const firstStatement = Debug.checkDefined(findAncestor(selection, isStatement), "Should find a statement");
-    const typeParameters = collectTypeParameters(checker, selection, firstStatement, file);
+    const enclosingNode = getEnclosingNode(selection, isJS);
+    if (enclosingNode === void 0)
+      return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
+    const typeParameters = collectTypeParameters(checker, selection, enclosingNode, file);
     if (!typeParameters)
       return { error: getLocaleSpecificMessage(Diagnostics.No_type_could_be_extracted_from_this_type_node) };
     const typeElements = flattenTypeLiteralNodeReference(checker, selection);
-    return { isJS, selection, firstStatement, typeParameters, typeElements };
+    return { isJS, selection, enclosingNode, typeParameters, typeElements };
   }
   function flattenTypeLiteralNodeReference(checker, node) {
     if (!node)
@@ -137546,7 +137809,7 @@ ${lanes.join("\n")}
   function rangeContainsSkipTrivia(r1, node, file) {
     return rangeContainsStartEnd(r1, skipTrivia(file.text, node.pos), node.end);
   }
-  function collectTypeParameters(checker, selection, statement, file) {
+  function collectTypeParameters(checker, selection, enclosingNode, file) {
     const result = [];
     return visitor(selection) ? void 0 : result;
     function visitor(node) {
@@ -137559,7 +137822,7 @@ ${lanes.join("\n")}
               if (decl.name.escapedText === typeName.escapedText && rangeContainsSkipTrivia(decl, selection, file)) {
                 return true;
               }
-              if (rangeContainsSkipTrivia(statement, decl, file) && !rangeContainsSkipTrivia(selection, decl, file)) {
+              if (rangeContainsSkipTrivia(enclosingNode, decl, file) && !rangeContainsSkipTrivia(selection, decl, file)) {
                 pushIfUnique(result, decl);
                 break;
               }
@@ -137579,7 +137842,7 @@ ${lanes.join("\n")}
       } else if (isTypeQueryNode(node)) {
         if (isIdentifier(node.exprName)) {
           const symbol = checker.resolveName(node.exprName.text, node.exprName, 111551 /* Value */, false);
-          if ((symbol == null ? void 0 : symbol.valueDeclaration) && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+          if ((symbol == null ? void 0 : symbol.valueDeclaration) && rangeContainsSkipTrivia(enclosingNode, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
             return true;
           }
         } else {
@@ -137595,19 +137858,19 @@ ${lanes.join("\n")}
     }
   }
   function doTypeAliasChange(changes, file, name, info) {
-    const { firstStatement, selection, typeParameters } = info;
+    const { enclosingNode, selection, typeParameters } = info;
     const newTypeNode = factory.createTypeAliasDeclaration(
       void 0,
       name,
       typeParameters.map((id) => factory.updateTypeParameterDeclaration(id, id.modifiers, id.name, id.constraint, void 0)),
       selection
     );
-    changes.insertNodeBefore(file, firstStatement, ignoreSourceNewlines(newTypeNode), true);
+    changes.insertNodeBefore(file, enclosingNode, ignoreSourceNewlines(newTypeNode), true);
     changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(id.name, void 0))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
   }
   function doInterfaceChange(changes, file, name, info) {
     var _a2;
-    const { firstStatement, selection, typeParameters, typeElements } = info;
+    const { enclosingNode, selection, typeParameters, typeElements } = info;
     const newTypeNode = factory.createInterfaceDeclaration(
       void 0,
       name,
@@ -137616,11 +137879,11 @@ ${lanes.join("\n")}
       typeElements
     );
     setTextRange(newTypeNode, (_a2 = typeElements[0]) == null ? void 0 : _a2.parent);
-    changes.insertNodeBefore(file, firstStatement, ignoreSourceNewlines(newTypeNode), true);
+    changes.insertNodeBefore(file, enclosingNode, ignoreSourceNewlines(newTypeNode), true);
     changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(id.name, void 0))), { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude, trailingTriviaOption: ts_textChanges_exports.TrailingTriviaOption.ExcludeWhitespace });
   }
-  function doTypedefChange(changes, file, name, info) {
-    const { firstStatement, selection, typeParameters } = info;
+  function doTypedefChange(changes, program, file, name, info) {
+    const { enclosingNode, selection, typeParameters } = info;
     setEmitFlags(selection, 3072 /* NoComments */ | 4096 /* NoNestedComments */);
     const node = factory.createJSDocTypedefTag(
       factory.createIdentifier("typedef"),
@@ -137638,9 +137901,21 @@ ${lanes.join("\n")}
       );
       templates.push(template);
     });
-    changes.insertNodeBefore(file, firstStatement, factory.createJSDocComment(void 0, factory.createNodeArray(concatenate(templates, [node]))), true);
+    const jsDoc = factory.createJSDocComment(void 0, factory.createNodeArray(concatenate(templates, [node])));
+    if (isJSDoc(enclosingNode)) {
+      const pos = enclosingNode.getStart(file);
+      const newLineCharacter = getNewLineCharacter(program.getCompilerOptions());
+      changes.insertNodeAt(file, enclosingNode.getStart(file), jsDoc, {
+        suffix: newLineCharacter + newLineCharacter + file.text.slice(getPrecedingNonSpaceCharacterPosition(file.text, pos - 1), pos)
+      });
+    } else {
+      changes.insertNodeBefore(file, enclosingNode, jsDoc, true);
+    }
     changes.replaceNode(file, selection, factory.createTypeReferenceNode(name, typeParameters.map((id) => factory.createTypeReferenceNode(id.name, void 0))));
   }
+  function getEnclosingNode(node, isJS) {
+    return findAncestor(node, isStatement) || (isJS ? findAncestor(node, isJSDoc) : void 0);
+  }
   var refactorName3, extractToTypeAliasAction, extractToInterfaceAction, extractToTypeDefAction;
   var init_extractType = __esm({
     "src/services/refactors/extractType.ts"() {
@@ -137694,7 +137969,7 @@ ${lanes.join("\n")}
           return emptyArray;
         },
         getEditsForAction: function getRefactorEditsToExtractType(context, actionName2) {
-          const { file } = context;
+          const { file, program } = context;
           const info = getRangeToExtract(context);
           Debug.assert(info && !isRefactorErrorInfo(info), "Expected to find a range to extract");
           const name = getUniqueName("NewType", file);
@@ -137705,7 +137980,7 @@ ${lanes.join("\n")}
                 return doTypeAliasChange(changes, file, name, info);
               case extractToTypeDefAction.name:
                 Debug.assert(info.isJS, "Invalid actionName/JS combo");
-                return doTypedefChange(changes, file, name, info);
+                return doTypedefChange(changes, program, file, name, info);
               case extractToInterfaceAction.name:
                 Debug.assert(!info.isJS && !!info.typeElements, "Invalid actionName/JS combo");
                 return doInterfaceChange(changes, file, name, info);
@@ -148474,6 +148749,7 @@ ${options.prefix}` : "\n" : options.prefix
     canHaveModifiers: () => canHaveModifiers,
     canJsonReportNoInputFiles: () => canJsonReportNoInputFiles,
     canProduceDiagnostics: () => canProduceDiagnostics,
+    canUsePropertyAccess: () => canUsePropertyAccess,
     canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
     cartesianProduct: () => cartesianProduct,
     cast: () => cast,
@@ -148750,6 +149026,7 @@ ${options.prefix}` : "\n" : options.prefix
     createMethod: () => createMethod,
     createMethodSignature: () => createMethodSignature,
     createModeAwareCache: () => createModeAwareCache,
+    createModeAwareCacheKey: () => createModeAwareCacheKey,
     createModifier: () => createModifier,
     createModifiersFromModifierFlags: () => createModifiersFromModifierFlags,
     createModuleBlock: () => createModuleBlock,
@@ -149229,6 +149506,7 @@ ${options.prefix}` : "\n" : options.prefix
     getJSXImplicitImportBase: () => getJSXImplicitImportBase,
     getJSXRuntimeImport: () => getJSXRuntimeImport,
     getJSXTransformEnabled: () => getJSXTransformEnabled,
+    getKeyForCompilerOptions: () => getKeyForCompilerOptions,
     getLanguageVariant: () => getLanguageVariant,
     getLastChild: () => getLastChild,
     getLeadingCommentRanges: () => getLeadingCommentRanges,
@@ -149500,6 +149778,7 @@ ${options.prefix}` : "\n" : options.prefix
     hasSyntacticModifier: () => hasSyntacticModifier,
     hasSyntacticModifiers: () => hasSyntacticModifiers,
     hasTSFileExtension: () => hasTSFileExtension,
+    hasTabstop: () => hasTabstop,
     hasTrailingDirectorySeparator: () => hasTrailingDirectorySeparator,
     hasType: () => hasType,
     hasTypeArguments: () => hasTypeArguments,
@@ -150149,6 +150428,7 @@ ${options.prefix}` : "\n" : options.prefix
     isUnparsedSource: () => isUnparsedSource,
     isUnparsedTextLike: () => isUnparsedTextLike,
     isUrl: () => isUrl,
+    isValidBigIntString: () => isValidBigIntString,
     isValidESSymbolDeclaration: () => isValidESSymbolDeclaration,
     isValidTypeOnlyAliasUseSite: () => isValidTypeOnlyAliasUseSite,
     isValueSignatureDeclaration: () => isValueSignatureDeclaration,
@@ -150280,6 +150560,7 @@ ${options.prefix}` : "\n" : options.prefix
     parameterIsThisKeyword: () => parameterIsThisKeyword,
     parameterNamePart: () => parameterNamePart,
     parseBaseNodeFactory: () => parseBaseNodeFactory,
+    parseBigInt: () => parseBigInt,
     parseBuildCommand: () => parseBuildCommand,
     parseCommandLine: () => parseCommandLine,
     parseCommandLineWorker: () => parseCommandLineWorker,
@@ -150298,6 +150579,7 @@ ${options.prefix}` : "\n" : options.prefix
     parseNodeModuleFromPath: () => parseNodeModuleFromPath,
     parsePackageName: () => parsePackageName,
     parsePseudoBigInt: () => parsePseudoBigInt,
+    parseValidBigInt: () => parseValidBigInt,
     patchWriteFileEnsuringDirectory: () => patchWriteFileEnsuringDirectory,
     pathContainsNodeModules: () => pathContainsNodeModules,
     pathIsAbsolute: () => pathIsAbsolute,