From ec1414f627dd243abeebf9a4c2d995377389820b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 20 Sep 2023 16:45:32 -0700 Subject: [PATCH] Source files not affected by all module resolution options (#55790) --- src/compiler/builderState.ts | 5 +- src/compiler/checker.ts | 3 +- src/compiler/commandLineParser.ts | 5 +- src/compiler/factory/nodeFactory.ts | 1 - src/compiler/moduleNameResolver.ts | 18 -- src/compiler/program.ts | 159 +++++++----------- src/compiler/types.ts | 12 +- src/compiler/utilities.ts | 45 +---- src/compiler/watch.ts | 2 +- src/server/project.ts | 23 ++- src/services/codefixes/convertToEsModule.ts | 14 +- .../codefixes/fixImportNonExportedMember.ts | 3 +- src/services/codefixes/fixSpelling.ts | 3 +- src/services/codefixes/importFixes.ts | 53 ++++-- src/services/findAllReferences.ts | 4 +- src/services/getEditsForFileRename.ts | 2 +- src/services/goToDefinition.ts | 9 +- src/services/refactors/moveToFile.ts | 2 +- src/services/services.ts | 5 - src/services/suggestionDiagnostics.ts | 3 +- .../unittests/reuseProgramStructure.ts | 4 +- .../unittests/tsserver/symlinkCache.ts | 2 +- .../unittests/tsserver/typingsInstaller.ts | 4 +- .../nodeColonModuleResolution.trace.json | 1 + ...-orphan,-and-orphan-script-info-changes.js | 6 +- ...he-source-file-if-script-info-is-orphan.js | 6 +- 26 files changed, 180 insertions(+), 214 deletions(-) diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts index 3a9dd2be65a..695bdce5527 100644 --- a/src/compiler/builderState.ts +++ b/src/compiler/builderState.ts @@ -238,8 +238,9 @@ export namespace BuilderState { } // Handle type reference directives - if (sourceFile.resolvedTypeReferenceDirectiveNames) { - sourceFile.resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => { + const resolvedTypeReferenceDirectiveNames = program.resolvedTypeReferenceDirectiveNames?.get(sourceFile.path); + if (resolvedTypeReferenceDirectiveNames) { + resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => { if (!resolvedTypeReferenceDirective) { return; } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index dedd196edee..40d4f07ffd3 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -342,7 +342,6 @@ import { getResolutionDiagnostic, getResolutionModeOverrideForClause, getResolvedExternalModuleName, - getResolvedModule, getResolveJsonModule, getRestParameterElementType, getRootDeclaration, @@ -4960,7 +4959,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { (isLiteralImportTypeNode(location) ? location : undefined)?.argument.literal; const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat; const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions); - const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode); + const resolvedModule = host.resolvedModules?.get(currentSourceFile.path)?.get(moduleReference, mode)?.resolvedModule; const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile); const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 0b8a038233d..9df645a212d 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -553,6 +553,7 @@ export const moduleOptionDeclaration: CommandLineOptionOfCustomType = { node16: ModuleKind.Node16, nodenext: ModuleKind.NodeNext, })), + affectsSourceFile: true, affectsModuleResolution: true, affectsEmit: true, affectsBuildInfo: true, @@ -994,6 +995,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [ bundler: ModuleResolutionKind.Bundler, })), deprecatedKeys: new Set(["node"]), + affectsSourceFile: true, affectsModuleResolution: true, paramType: Diagnostics.STRATEGY, category: Diagnostics.Modules, @@ -1540,6 +1542,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [ legacy: ModuleDetectionKind.Legacy, force: ModuleDetectionKind.Force, })), + affectsSourceFile: true, affectsModuleResolution: true, description: Diagnostics.Control_what_method_is_used_to_detect_module_format_JS_files, category: Diagnostics.Language_and_Environment, @@ -1571,7 +1574,7 @@ export const affectsDeclarationPathOptionDeclarations: readonly CommandLineOptio export const moduleResolutionOptionDeclarations: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsModuleResolution); /** @internal */ -export const sourceFileAffectingCompilerOptions: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsSourceFile || !!option.affectsModuleResolution || !!option.affectsBindDiagnostics); +export const sourceFileAffectingCompilerOptions: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsSourceFile || !!option.affectsBindDiagnostics); /** @internal */ export const optionsAffectingProgramStructure: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsProgramStructure); diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts index ededdbd057a..d84cce2ca09 100644 --- a/src/compiler/factory/nodeFactory.ts +++ b/src/compiler/factory/nodeFactory.ts @@ -6026,7 +6026,6 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode node.imports = undefined!; node.moduleAugmentations = undefined!; node.ambientModuleNames = undefined!; - node.resolvedModules = undefined; node.classifiableNames = undefined; node.impliedNodeFormat = undefined; return node; diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 43e34558c7c..0fdae6df74e 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -91,14 +91,12 @@ import { removeFileExtension, removePrefix, ResolutionMode, - ResolutionNameAndModeGetter, ResolvedModuleWithFailedLookupLocations, ResolvedProjectReference, ResolvedTypeReferenceDirective, ResolvedTypeReferenceDirectiveWithFailedLookupLocations, some, sort, - SourceFile, startsWith, supportedDeclarationExtensions, supportedJSExtensionsFlat, @@ -1091,22 +1089,6 @@ export function createModeAwareCache(): ModeAwareCache { } } -/** @internal */ -export function zipToModeAwareCache( - file: SourceFile, - keys: readonly K[], - values: readonly V[], - nameAndModeGetter: ResolutionNameAndModeGetter, -): ModeAwareCache { - Debug.assert(keys.length === values.length); - const map = createModeAwareCache(); - for (let i = 0; i < keys.length; ++i) { - const entry = keys[i]; - map.set(nameAndModeGetter.getName(entry), nameAndModeGetter.getMode(entry, file), values[i]); - } - return map; -} - function getOriginalOrResolvedModuleFileName(result: ResolvedModuleWithFailedLookupLocations) { return result.resolvedModule && (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName); } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 113c9561791..73810c6fc89 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -139,7 +139,6 @@ import { getPathFromPathComponents, getPositionOfLineAndCharacter, getPropertyArrayElementValue, - getResolvedModule, getResolveJsonModule, getRootLength, getSetExternalModuleIndicator, @@ -272,6 +271,7 @@ import { removeSuffix, resolutionExtensionIsTSOrJson, ResolutionMode, + ResolutionWithFailedLookupLocations, resolveConfigFileProjectName, ResolvedConfigFileName, ResolvedModuleFull, @@ -288,8 +288,6 @@ import { ScriptTarget, setParent, setParentRecursive, - setResolvedModule, - setResolvedTypeReferenceDirective, shouldResolveJsRequire, skipTrivia, skipTypeChecking, @@ -330,7 +328,6 @@ import { WriteFileCallback, WriteFileCallbackData, writeFileEnsuringDirectories, - zipToModeAwareCache, } from "./_namespaces/ts"; import * as performance from "./_namespaces/ts.performance"; @@ -1173,14 +1170,14 @@ export function isReferenceFileLocation(location: ReferenceFileLocation | Synthe } /** @internal */ -export function getReferencedFileLocation(getSourceFileByPath: (path: Path) => SourceFile | undefined, ref: ReferencedFile): ReferenceFileLocation | SyntheticReferenceFileLocation { - const file = Debug.checkDefined(getSourceFileByPath(ref.file)); +export function getReferencedFileLocation(program: Program, ref: ReferencedFile): ReferenceFileLocation | SyntheticReferenceFileLocation { + const file = Debug.checkDefined(program.getSourceFileByPath(ref.file)); const { kind, index } = ref; let pos: number | undefined, end: number | undefined, packageId: PackageId | undefined, resolutionMode: FileReference["resolutionMode"] | undefined; switch (kind) { case FileIncludeKind.Import: const importLiteral = getModuleNameStringLiteralAt(file, index); - packageId = file.resolvedModules?.get(importLiteral.text, getModeForResolutionAtIndex(file, index))?.resolvedModule?.packageId; + packageId = program.resolvedModules?.get(file.path)?.get(importLiteral.text, getModeForResolutionAtIndex(file, index))?.resolvedModule?.packageId; if (importLiteral.pos === -1) return { file, packageId, text: importLiteral.text }; pos = skipTrivia(file.text, importLiteral.pos); end = importLiteral.end; @@ -1190,7 +1187,7 @@ export function getReferencedFileLocation(getSourceFileByPath: (path: Path) => S break; case FileIncludeKind.TypeReferenceDirective: ({ pos, end, resolutionMode } = file.typeReferenceDirectives[index]); - packageId = file.resolvedTypeReferenceDirectiveNames?.get(toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)?.resolvedTypeReferenceDirective?.packageId; + packageId = program.resolvedTypeReferenceDirectiveNames?.get(file.path)?.get(toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)?.resolvedTypeReferenceDirective?.packageId; break; case FileIncludeKind.LibReferenceDirective: ({ pos, end } = file.libReferenceDirectives[index]); @@ -1515,6 +1512,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg let resolvedLibReferences: Map | undefined; let resolvedLibProcessing: Map | undefined; + let resolvedModules: Map> | undefined; + let resolvedModulesProcessing: Map | undefined; + let resolvedTypeReferenceDirectiveNames: Map> | undefined; + let resolvedTypeReferenceDirectiveNamesProcessing: Map | undefined; + let packageMap: Map | undefined; // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules. @@ -1840,6 +1842,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // unconditionally set oldProgram to undefined to prevent it from being captured in closure oldProgram = undefined; resolvedLibProcessing = undefined; + resolvedModulesProcessing = undefined; + resolvedTypeReferenceDirectiveNamesProcessing = undefined; const program: Program = { getRootFileNames: () => rootNames, @@ -1881,6 +1885,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg sourceFileToPackageName, redirectTargetsMap, usesUriStyleNodeCoreModules, + resolvedModules, + resolvedTypeReferenceDirectiveNames, resolvedLibReferences, getCurrentPackagesMap: () => packageMap, typesPackageExists, @@ -1915,7 +1921,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg case FilePreprocessingDiagnosticsKind.FilePreprocessingFileExplainingDiagnostic: return programDiagnostics.add(createDiagnosticExplainingFile(diagnostic.file && getSourceFileByPath(diagnostic.file), diagnostic.fileProcessingReason, diagnostic.diagnostic, diagnostic.args || emptyArray)); case FilePreprocessingDiagnosticsKind.FilePreprocessingReferencedDiagnostic: - const { file, pos, end } = getReferencedFileLocation(getSourceFileByPath, diagnostic.reason) as ReferenceFileLocation; + const { file, pos, end } = getReferencedFileLocation(program, diagnostic.reason) as ReferenceFileLocation; return programDiagnostics.add(createFileDiagnostic(file, Debug.checkDefined(pos), Debug.checkDefined(end) - pos, diagnostic.diagnostic, ...diagnostic.args || emptyArray)); case FilePreprocessingDiagnosticsKind.ResolutionDiagnostics: return diagnostic.diagnostics.forEach(d => programDiagnostics.add(d)); @@ -1938,13 +1944,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // This is useful as an approximation of whether a package bundles its own types. // Note: we only look at files already found by module resolution, // so there may be files we did not consider. - files.forEach(sf => { - if (!sf.resolvedModules) return; - - sf.resolvedModules.forEach(({ resolvedModule }) => { + files.forEach(sf => + resolvedModules?.get(sf.path)?.forEach(({ resolvedModule }) => { if (resolvedModule?.packageId) packageMap!.set(resolvedModule.packageId.name, resolvedModule.extension === Extension.Dts || !!packageMap!.get(resolvedModule.packageId.name)); - }); - }); + }) + ); return packageMap; } @@ -2090,23 +2094,6 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg return resolveModuleNamesWorker(moduleNames, file, /*reusedNames*/ undefined); } - const oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName); - if (oldSourceFile !== file && file.resolvedModules) { - // `file` was created for the new program. - // - // We only set `file.resolvedModules` via work from the current function, - // so it is defined iff we already called the current function on `file`. - // That call happened no later than the creation of the `file` object, - // which per above occurred during the current program creation. - // Since we assume the filesystem does not change during program creation, - // it is safe to reuse resolutions from the earlier call. - const result: ResolvedModuleWithFailedLookupLocations[] = []; - for (const moduleName of moduleNames) { - const resolvedModule = file.resolvedModules.get(moduleName.text, getModeForUsageLocation(file, moduleName))!; - result.push(resolvedModule); - } - return result; - } // At this point, we know at least one of the following hold: // - file has local declarations for ambient modules // - old program state is available @@ -2127,13 +2114,14 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg let reusedNames: StringLiteralLike[] | undefined; /** A transient placeholder used to mark predicted resolution in the result list. */ const predictedToResolveToAmbientModuleMarker: ResolvedModuleWithFailedLookupLocations = emptyResolution; + const oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName); for (let i = 0; i < moduleNames.length; i++) { const moduleName = moduleNames[i]; // If the source file is unchanged and doesnt have invalidated resolution, reuse the module resolutions - if (file === oldSourceFile && !hasInvalidatedResolutions(oldSourceFile.path)) { + if (file === oldSourceFile && !hasInvalidatedResolutions(file.path)) { const mode = getModeForUsageLocation(file, moduleName); - const oldResolution = oldSourceFile.resolvedModules?.get(moduleName.text, mode); + const oldResolution = oldProgram?.resolvedModules?.get(file.path)?.get(moduleName.text, mode); if (oldResolution?.resolvedModule) { if (isTraceEnabled(options, host)) { trace( @@ -2201,7 +2189,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // If we change our policy of rechecking failed lookups on each program create, // we should adjust the value returned here. function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName: StringLiteralLike): boolean { - const resolutionToFile = getResolvedModule(oldSourceFile, moduleName.text, getModeForUsageLocation(file, moduleName)); + const resolutionToFile = oldProgram?.resolvedModules?.get(file.path)?.get(moduleName.text, getModeForUsageLocation(file, moduleName))?.resolvedModule; const resolvedFile = resolutionToFile && oldProgram!.getSourceFile(resolutionToFile.resolvedFileName); if (resolutionToFile && resolvedFile) { // In the old program, we resolved to an ambient module that was in the same @@ -2234,41 +2222,21 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg return resolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFile, /*reusedNames*/ undefined); } - const oldSourceFile = !isString(containingFile) ? oldProgram && oldProgram.getSourceFile(containingFile.fileName) : undefined; - if (!isString(containingFile)) { - if (oldSourceFile !== containingFile && containingFile.resolvedTypeReferenceDirectiveNames) { - // `file` was created for the new program. - // - // We only set `file.resolvedTypeReferenceDirectiveNames` via work from the current function, - // so it is defined iff we already called the current function on `file`. - // That call happened no later than the creation of the `file` object, - // which per above occurred during the current program creation. - // Since we assume the filesystem does not change during program creation, - // it is safe to reuse resolutions from the earlier call. - const result: ResolvedTypeReferenceDirectiveWithFailedLookupLocations[] = []; - for (const typeDirectiveName of typeDirectiveNames as readonly FileReference[]) { - // We lower-case all type references because npm automatically lowercases all packages. See GH#9824. - const resolvedTypeReferenceDirective = containingFile.resolvedTypeReferenceDirectiveNames.get(getTypeReferenceResolutionName(typeDirectiveName), getModeForFileReference(typeDirectiveName, containingFile.impliedNodeFormat))!; - result.push(resolvedTypeReferenceDirective); - } - return result; - } - } - /** An ordered list of module names for which we cannot recover the resolution. */ let unknownTypeReferenceDirectiveNames: T[] | undefined; let result: ResolvedTypeReferenceDirectiveWithFailedLookupLocations[] | undefined; let reusedNames: T[] | undefined; const containingSourceFile = !isString(containingFile) ? containingFile : undefined; + const oldSourceFile = !isString(containingFile) ? oldProgram && oldProgram.getSourceFile(containingFile.fileName) : undefined; const canReuseResolutions = !isString(containingFile) ? - containingFile === oldSourceFile && !hasInvalidatedResolutions(oldSourceFile.path) : + containingFile === oldSourceFile && !hasInvalidatedResolutions(containingFile.path) : !hasInvalidatedResolutions(toPath(containingFile)); for (let i = 0; i < typeDirectiveNames.length; i++) { const entry = typeDirectiveNames[i]; if (canReuseResolutions) { const typeDirectiveName = getTypeReferenceResolutionName(entry); const mode = getModeForFileReference(entry, containingSourceFile?.impliedNodeFormat); - const oldResolution = (!isString(containingFile) ? oldSourceFile?.resolvedTypeReferenceDirectiveNames : oldProgram?.getAutomaticTypeDirectiveResolutions())?.get(typeDirectiveName, mode); + const oldResolution = (!isString(containingFile) ? oldProgram?.resolvedTypeReferenceDirectiveNames?.get(containingFile.path) : oldProgram?.getAutomaticTypeDirectiveResolutions())?.get(typeDirectiveName, mode); if (oldResolution?.resolvedTypeReferenceDirective) { if (isTraceEnabled(options, host)) { trace( @@ -2370,7 +2338,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg // check if program source files has changed in the way that can affect structure of the program const newSourceFiles: SourceFile[] = []; - const modifiedSourceFiles: { oldFile: SourceFile; newFile: SourceFile; }[] = []; + const modifiedSourceFiles: SourceFile[] = []; structureIsReused = StructureIsReused.Completely; // If the missing file paths are now present, it can change the progam structure, @@ -2482,14 +2450,19 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg } // tentatively approve the file - modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile }); + modifiedSourceFiles.push(newSourceFile); } else if (hasInvalidatedResolutions(oldSourceFile.path)) { // 'module/types' references could have changed structureIsReused = StructureIsReused.SafeModules; // add file to the modified list so that we will resolve it later - modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile }); + modifiedSourceFiles.push(newSourceFile); + } + else { + for (const moduleName of oldSourceFile.ambientModuleNames) { + ambientModuleNameToUnmodifiedFileName.set(moduleName, oldSourceFile.fileName); + } } // if file has passed all checks it should be safe to reuse it @@ -2500,37 +2473,26 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg return structureIsReused; } - const modifiedFiles = modifiedSourceFiles.map(f => f.oldFile); - for (const oldFile of oldSourceFiles) { - if (!contains(modifiedFiles, oldFile)) { - for (const moduleName of oldFile.ambientModuleNames) { - ambientModuleNameToUnmodifiedFileName.set(moduleName, oldFile.fileName); - } - } - } // try to verify results of module resolution - for (const { oldFile: oldSourceFile, newFile: newSourceFile } of modifiedSourceFiles) { + for (const newSourceFile of modifiedSourceFiles) { const moduleNames = getModuleNames(newSourceFile); const resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFile); + (resolvedModulesProcessing ??= new Map()).set(newSourceFile.path, resolutions); + const oldResolutions = oldProgram.resolvedModules?.get(newSourceFile.path); // ensure that module resolution results are still correct - const resolutionsChanged = hasChangesInResolutions(moduleNames, newSourceFile, resolutions, oldSourceFile.resolvedModules, moduleResolutionIsEqualTo, moduleResolutionNameAndModeGetter); - if (resolutionsChanged) { - structureIsReused = StructureIsReused.SafeModules; - newSourceFile.resolvedModules = zipToModeAwareCache(newSourceFile, moduleNames, resolutions, moduleResolutionNameAndModeGetter); - } - else { - newSourceFile.resolvedModules = oldSourceFile.resolvedModules; - } + const resolutionsChanged = hasChangesInResolutions(moduleNames, newSourceFile, resolutions, oldResolutions, moduleResolutionIsEqualTo, moduleResolutionNameAndModeGetter); + if (resolutionsChanged) structureIsReused = StructureIsReused.SafeModules; const typesReferenceDirectives = newSourceFile.typeReferenceDirectives; const typeReferenceResolutions = resolveTypeReferenceDirectiveNamesReusingOldState(typesReferenceDirectives, newSourceFile); + (resolvedTypeReferenceDirectiveNamesProcessing ??= new Map()).set(newSourceFile.path, typeReferenceResolutions); // ensure that types resolutions are still correct - const typeReferenceResolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, newSourceFile, typeReferenceResolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, typeDirectiveIsEqualTo, typeReferenceResolutionNameAndModeGetter); + const oldTypeResolutions = oldProgram.resolvedTypeReferenceDirectiveNames?.get(newSourceFile.path); + const typeReferenceResolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, newSourceFile, typeReferenceResolutions, oldTypeResolutions, typeDirectiveIsEqualTo, typeReferenceResolutionNameAndModeGetter); if (typeReferenceResolutionsChanged) { structureIsReused = StructureIsReused.SafeModules; - newSourceFile.resolvedTypeReferenceDirectiveNames = zipToModeAwareCache(newSourceFile, typesReferenceDirectives, typeReferenceResolutions, typeReferenceResolutionNameAndModeGetter); } - else { - newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames; + else if (oldTypeResolutions) { + (resolvedTypeReferenceDirectiveNamesProcessing ??= new Map()).set(newSourceFile.path, oldTypeResolutions); } } @@ -2589,6 +2551,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg sourceFileToPackageName = oldProgram.sourceFileToPackageName; redirectTargetsMap = oldProgram.redirectTargetsMap; usesUriStyleNodeCoreModules = oldProgram.usesUriStyleNodeCoreModules; + resolvedModules = oldProgram.resolvedModules; + resolvedTypeReferenceDirectiveNames = oldProgram.resolvedTypeReferenceDirectiveNames; resolvedLibReferences = oldProgram.resolvedLibReferences; packageMap = oldProgram.getCurrentPackagesMap(); @@ -3834,18 +3798,18 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg function processTypeReferenceDirectives(file: SourceFile) { const typeDirectives = file.typeReferenceDirectives; - if (!typeDirectives.length) { - file.resolvedTypeReferenceDirectiveNames = undefined; - return; - } + if (!typeDirectives.length) return; - const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectives, file); + const resolutions = resolvedTypeReferenceDirectiveNamesProcessing?.get(file.path) || + resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectives, file); + const resolutionsInFile = createModeAwareCache(); + (resolvedTypeReferenceDirectiveNames ??= new Map()).set(file.path, resolutionsInFile); for (let index = 0; index < typeDirectives.length; index++) { const ref = file.typeReferenceDirectives[index]; const resolvedTypeReferenceDirective = resolutions[index]; // store resolved type directive on the file const fileName = toFileNameLowerCase(ref.fileName); - setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective, getModeForFileReference(ref, file.impliedNodeFormat)); + resolutionsInFile.set(fileName, getModeForFileReference(ref, file.impliedNodeFormat), resolvedTypeReferenceDirective); const mode = ref.resolutionMode || file.impliedNodeFormat; if (mode && getEmitModuleResolutionKind(options) !== ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeNext) { (fileProcessingDiagnostics ??= []).push({ @@ -4013,14 +3977,17 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg if (file.imports.length || file.moduleAugmentations.length) { // Because global augmentation doesn't have string literal name, we can check for global augmentation as such. const moduleNames = getModuleNames(file); - const resolutions = resolveModuleNamesReusingOldState(moduleNames, file); + const resolutions = resolvedModulesProcessing?.get(file.path) || + resolveModuleNamesReusingOldState(moduleNames, file); Debug.assert(resolutions.length === moduleNames.length); const optionsForFile = (useSourceOfProjectReferenceRedirect ? getRedirectReferenceForResolution(file)?.commandLine.options : undefined) || options; + const resolutionsInFile = createModeAwareCache(); + (resolvedModules ??= new Map()).set(file.path, resolutionsInFile); for (let index = 0; index < moduleNames.length; index++) { const resolution = resolutions[index].resolvedModule; const moduleName = moduleNames[index].text; const mode = getModeForUsageLocation(file, moduleNames[index]); - setResolvedModule(file, moduleName, resolutions[index], mode); + resolutionsInFile.set(moduleName, mode, resolutions[index]); addResolutionDiagnosticsFromResolutionOrCache(file, moduleName, resolutions[index], mode); if (!resolution) { @@ -4070,10 +4037,6 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg } } } - else { - // no imports - drop cached module resolutions - file.resolvedModules = undefined; - } } function checkSourceFilesBelongToPath(sourceFiles: readonly SourceFile[], rootDirectory: string): boolean { @@ -4613,7 +4576,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg if (fileProcessingReason) processReason(fileProcessingReason); // If we have location and there is only one reason file is in which is the location, dont add details for file include if (locationReason && fileIncludeReasons?.length === 1) fileIncludeReasons = undefined; - const location = locationReason && getReferencedFileLocation(getSourceFileByPath, locationReason); + const location = locationReason && getReferencedFileLocation(program, locationReason); const fileIncludeReasonDetails = fileIncludeReasons && chainDiagnosticMessages(fileIncludeReasons, Diagnostics.The_file_is_in_the_program_because_Colon); const redirectInfo = file && explainIfFileIsRedirectAndImpliedFormat(file); const chain = chainDiagnosticMessages(redirectInfo ? fileIncludeReasonDetails ? [fileIncludeReasonDetails, ...redirectInfo] : redirectInfo : fileIncludeReasonDetails, diagnostic, ...args || emptyArray); @@ -4651,7 +4614,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg function fileIncludeReasonToRelatedInformation(reason: FileIncludeReason): DiagnosticWithLocation | undefined { if (isReferencedFile(reason)) { - const referenceLocation = getReferencedFileLocation(getSourceFileByPath, reason); + const referenceLocation = getReferencedFileLocation(program, reason); let message: DiagnosticMessage; switch (reason.kind) { case FileIncludeKind.Import: @@ -4969,8 +4932,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg if (!symlinks) { symlinks = createSymlinkCache(currentDirectory, getCanonicalFileName); } - if (files && automaticTypeDirectiveResolutions && !symlinks.hasProcessedResolutions()) { - symlinks.setSymlinksFromResolutions(files, automaticTypeDirectiveResolutions); + if (files && !symlinks.hasProcessedResolutions()) { + symlinks.setSymlinksFromResolutions(resolvedModules, resolvedTypeReferenceDirectiveNames, automaticTypeDirectiveResolutions); } return symlinks; } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 3bc75376014..cf6bc023f8d 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -4277,11 +4277,6 @@ export interface SourceFile extends Declaration, LocalsContainer { /** @internal */ classifiableNames?: ReadonlySet<__String>; // Comments containing @ts-* directives, in order. /** @internal */ commentDirectives?: CommentDirective[]; - // Stores a mapping 'external module reference text' -> 'resolved file name' | undefined - // It is used to resolve module names in the checker. - // Content of this field should never be used directly - use getResolvedModuleFileName/setResolvedModuleFileName functions instead - /** @internal */ resolvedModules?: ModeAwareCache; - /** @internal */ resolvedTypeReferenceDirectiveNames?: ModeAwareCache; /** @internal */ imports: readonly StringLiteralLike[]; // Identifier only if `declare global` /** @internal */ moduleAugmentations: readonly (StringLiteral | Identifier)[]; @@ -4652,6 +4647,11 @@ export interface Program extends ScriptReferenceHost { /** @internal */ getFilesByNameMap(): Map; + /** @internal */ + resolvedModules: Map> | undefined; + /** @internal */ + resolvedTypeReferenceDirectiveNames: Map> | undefined; + /** * Emits the JavaScript and declaration files. If targetSourceFile is not specified, then * the JavaScript and declaration files will be produced for all the files in this program. @@ -4868,6 +4868,8 @@ export interface TypeCheckerHost extends ModuleSpecifierResolutionHost { getProjectReferenceRedirect(fileName: string): string | undefined; isSourceOfProjectReferenceRedirect(fileName: string): boolean; + resolvedModules: Map> | undefined; + readonly redirectTargetsMap: RedirectTargetsMap; typesPackageExists(packageName: string): boolean; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 209d9fd49d8..2459c145c17 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -79,7 +79,6 @@ import { contains, containsPath, createGetCanonicalFileName, - createModeAwareCache, createMultiMap, createScanner, createTextSpan, @@ -744,34 +743,6 @@ export function getFullWidth(node: Node) { return node.end - node.pos; } -/** @internal */ -export function getResolvedModule(sourceFile: SourceFile | undefined, moduleNameText: string, mode: ResolutionMode): ResolvedModuleFull | undefined { - return sourceFile?.resolvedModules?.get(moduleNameText, mode)?.resolvedModule; -} - -/** @internal */ -export function setResolvedModule(sourceFile: SourceFile, moduleNameText: string, resolvedModule: ResolvedModuleWithFailedLookupLocations, mode: ResolutionMode): void { - if (!sourceFile.resolvedModules) { - sourceFile.resolvedModules = createModeAwareCache(); - } - - sourceFile.resolvedModules.set(moduleNameText, mode, resolvedModule); -} - -/** @internal */ -export function setResolvedTypeReferenceDirective(sourceFile: SourceFile, typeReferenceDirectiveName: string, resolvedTypeReferenceDirective: ResolvedTypeReferenceDirectiveWithFailedLookupLocations, mode: ResolutionMode): void { - if (!sourceFile.resolvedTypeReferenceDirectiveNames) { - sourceFile.resolvedTypeReferenceDirectiveNames = createModeAwareCache(); - } - - sourceFile.resolvedTypeReferenceDirectiveNames.set(typeReferenceDirectiveName, mode, resolvedTypeReferenceDirective); -} - -/** @internal */ -export function getResolvedTypeReferenceDirective(sourceFile: SourceFile | undefined, typeReferenceDirectiveName: string, mode: ResolutionMode): ResolvedTypeReferenceDirective | undefined { - return sourceFile?.resolvedTypeReferenceDirectiveNames?.get(typeReferenceDirectiveName, mode)?.resolvedTypeReferenceDirective; -} - /** @internal */ export function projectReferenceIsEqualTo(oldRef: ProjectReference, newRef: ProjectReference) { return oldRef.path === newRef.path && @@ -795,7 +766,7 @@ export function moduleResolutionIsEqualTo(oldResolution: ResolvedModuleWithFaile /** @internal */ export function createModuleNotFoundChain(sourceFile: SourceFile, host: TypeCheckerHost, moduleReference: string, mode: ResolutionMode, packageName: string) { - const node10Result = sourceFile.resolvedModules?.get(moduleReference, mode)?.node10Result; + const node10Result = host.resolvedModules?.get(sourceFile.path)?.get(moduleReference, mode)?.node10Result; const result = node10Result ? chainDiagnosticMessages( /*details*/ undefined, @@ -8853,7 +8824,11 @@ export interface SymlinkCache { * don't include automatic type reference directives. Must be called only when * `hasProcessedResolutions` returns false (once per cache instance). */ - setSymlinksFromResolutions(files: readonly SourceFile[], typeReferenceDirectives: ModeAwareCache): void; + setSymlinksFromResolutions( + resolvedModules: Map> | undefined, + resolvedTypeReferenceDirectiveNames: Map> | undefined, + typeReferenceDirectives: ModeAwareCache, + ): void; /** * @internal * Whether `setSymlinksFromResolutions` has already been called. @@ -8885,13 +8860,11 @@ export function createSymlinkCache(cwd: string, getCanonicalFileName: GetCanonic (symlinkedDirectories || (symlinkedDirectories = new Map())).set(symlinkPath, real); } }, - setSymlinksFromResolutions(files, typeReferenceDirectives) { + setSymlinksFromResolutions(resolvedModules, resolvedTypeReferenceDirectiveNames, typeReferenceDirectives) { Debug.assert(!hasProcessedResolutions); hasProcessedResolutions = true; - for (const file of files) { - file.resolvedModules?.forEach(resolution => processResolution(this, resolution.resolvedModule)); - file.resolvedTypeReferenceDirectiveNames?.forEach(resolution => processResolution(this, resolution.resolvedTypeReferenceDirective)); - } + resolvedModules?.forEach(cache => cache.forEach(resolution => processResolution(this, resolution.resolvedModule))); + resolvedTypeReferenceDirectiveNames?.forEach(cache => cache.forEach(resolution => processResolution(this, resolution.resolvedTypeReferenceDirective))); typeReferenceDirectives.forEach(resolution => processResolution(this, resolution.resolvedTypeReferenceDirective)); }, hasProcessedResolutions: () => hasProcessedResolutions, diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index 9d7991a2984..f87c3f72659 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -442,7 +442,7 @@ export function getMatchedIncludeSpec(program: Program, fileName: string) { export function fileIncludeReasonToDiagnostics(program: Program, reason: FileIncludeReason, fileNameConvertor?: (fileName: string) => string): DiagnosticMessageChain { const options = program.getCompilerOptions(); if (isReferencedFile(reason)) { - const referenceLocation = getReferencedFileLocation(path => program.getSourceFileByPath(path), reason); + const referenceLocation = getReferencedFileLocation(program, reason); const referenceText = isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : `"${referenceLocation.text}"`; let message: DiagnosticMessage; Debug.assert(isReferenceFileLocation(referenceLocation) || reason.kind === FileIncludeKind.Import, "Only synthetic references are imports"); diff --git a/src/server/project.ts b/src/server/project.ts index 489154dd0b4..a32fd668d0b 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -603,7 +603,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo } if (this.program && !this.symlinks.hasProcessedResolutions()) { this.symlinks.setSymlinksFromResolutions( - this.program.getSourceFiles(), + this.program.resolvedModules, + this.program.resolvedTypeReferenceDirectiveNames, this.program.getAutomaticTypeDirectiveResolutions(), ); } @@ -2232,15 +2233,27 @@ function getUnresolvedImports(program: Program, cachedUnresolvedImportsPerFile: const sourceFiles = program.getSourceFiles(); tracing?.push(tracing.Phase.Session, "getUnresolvedImports", { count: sourceFiles.length }); const ambientModules = program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName())); - const result = sortAndDeduplicate(flatMap(sourceFiles, sourceFile => extractUnresolvedImportsFromSourceFile(sourceFile, ambientModules, cachedUnresolvedImportsPerFile))); + const result = sortAndDeduplicate(flatMap(sourceFiles, sourceFile => + extractUnresolvedImportsFromSourceFile( + program, + sourceFile, + ambientModules, + cachedUnresolvedImportsPerFile, + ))); tracing?.pop(); return result; } -function extractUnresolvedImportsFromSourceFile(file: SourceFile, ambientModules: readonly string[], cachedUnresolvedImportsPerFile: Map): readonly string[] { +function extractUnresolvedImportsFromSourceFile( + program: Program, + file: SourceFile, + ambientModules: readonly string[], + cachedUnresolvedImportsPerFile: Map, +): readonly string[] { return getOrUpdate(cachedUnresolvedImportsPerFile, file.path, () => { - if (!file.resolvedModules) return emptyArray; + const resolvedModules = program.resolvedModules?.get(file.path); + if (!resolvedModules) return emptyArray; let unresolvedImports: string[] | undefined; - file.resolvedModules.forEach(({ resolvedModule }, name) => { + resolvedModules.forEach(({ resolvedModule }, name) => { // pick unresolved non-relative names if ( (!resolvedModule || !resolutionExtensionIsTSOrJson(resolvedModule.extension)) && diff --git a/src/services/codefixes/convertToEsModule.ts b/src/services/codefixes/convertToEsModule.ts index 1a5d2ad8ad2..50209016301 100644 --- a/src/services/codefixes/convertToEsModule.ts +++ b/src/services/codefixes/convertToEsModule.ts @@ -28,7 +28,6 @@ import { getEmitScriptTarget, getModeForUsageLocation, getQuotePreference, - getResolvedModule, getSynthesizedDeepClone, getSynthesizedDeepClones, getSynthesizedDeepClonesWithReplacements, @@ -61,6 +60,7 @@ import { NodeFlags, ObjectLiteralElementLike, ObjectLiteralExpression, + Program, PropertyAccessExpression, QuotePreference, rangeContainsRange, @@ -90,7 +90,7 @@ registerCodeFix({ const moduleExportsChangedToDefault = convertFileToEsModule(sourceFile, program.getTypeChecker(), changes, getEmitScriptTarget(program.getCompilerOptions()), getQuotePreference(sourceFile, preferences)); if (moduleExportsChangedToDefault) { for (const importingFile of program.getSourceFiles()) { - fixImportOfModuleExports(importingFile, sourceFile, changes, getQuotePreference(importingFile, preferences)); + fixImportOfModuleExports(importingFile, sourceFile, program, changes, getQuotePreference(importingFile, preferences)); } } }); @@ -99,9 +99,15 @@ registerCodeFix({ }, }); -function fixImportOfModuleExports(importingFile: SourceFile, exportingFile: SourceFile, changes: textChanges.ChangeTracker, quotePreference: QuotePreference) { +function fixImportOfModuleExports( + importingFile: SourceFile, + exportingFile: SourceFile, + program: Program, + changes: textChanges.ChangeTracker, + quotePreference: QuotePreference, +) { for (const moduleSpecifier of importingFile.imports) { - const imported = getResolvedModule(importingFile, moduleSpecifier.text, getModeForUsageLocation(importingFile, moduleSpecifier)); + const imported = program.resolvedModules?.get(importingFile.path)?.get(moduleSpecifier.text, getModeForUsageLocation(importingFile, moduleSpecifier))?.resolvedModule; if (!imported || imported.resolvedFileName !== exportingFile.fileName) { continue; } diff --git a/src/services/codefixes/fixImportNonExportedMember.ts b/src/services/codefixes/fixImportNonExportedMember.ts index 51202cc8c32..c8e65a0d4b5 100644 --- a/src/services/codefixes/fixImportNonExportedMember.ts +++ b/src/services/codefixes/fixImportNonExportedMember.ts @@ -10,7 +10,6 @@ import { findLast, firstOrUndefined, getIsolatedModules, - getResolvedModule, getTokenAtPosition, Identifier, isExportDeclaration, @@ -120,7 +119,7 @@ function getInfo(sourceFile: SourceFile, pos: number, program: Program): Info | const moduleSpecifier = isStringLiteral(importDeclaration.moduleSpecifier) ? importDeclaration.moduleSpecifier.text : undefined; if (moduleSpecifier === undefined) return undefined; - const resolvedModule = getResolvedModule(sourceFile, moduleSpecifier, /*mode*/ undefined); + const resolvedModule = program.resolvedModules?.get(sourceFile.path)?.get(moduleSpecifier, /*mode*/ undefined)?.resolvedModule; if (resolvedModule === undefined) return undefined; const moduleSourceFile = program.getSourceFile(resolvedModule.resolvedFileName); diff --git a/src/services/codefixes/fixSpelling.ts b/src/services/codefixes/fixSpelling.ts index 222851cb99f..d979a0fdb53 100644 --- a/src/services/codefixes/fixSpelling.ts +++ b/src/services/codefixes/fixSpelling.ts @@ -8,7 +8,6 @@ import { getEmitScriptTarget, getMeaningFromLocation, getModeForUsageLocation, - getResolvedModule, getTextOfNode, getTokenAtPosition, hasSyntacticModifier, @@ -183,7 +182,7 @@ function convertSemanticMeaningToSymbolFlags(meaning: SemanticMeaning): SymbolFl function getResolvedSourceFileFromImportDeclaration(sourceFile: SourceFile, context: CodeFixContextBase, importDeclaration: ImportDeclaration): SourceFile | undefined { if (!importDeclaration || !isStringLiteralLike(importDeclaration.moduleSpecifier)) return undefined; - const resolvedModule = getResolvedModule(sourceFile, importDeclaration.moduleSpecifier.text, getModeForUsageLocation(sourceFile, importDeclaration.moduleSpecifier)); + const resolvedModule = context.program.resolvedModules?.get(sourceFile.path)?.get(importDeclaration.moduleSpecifier.text, getModeForUsageLocation(sourceFile, importDeclaration.moduleSpecifier))?.resolvedModule; if (!resolvedModule) return undefined; return context.program.getSourceFile(resolvedModule.resolvedFileName); diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts index e1c97053de5..a552dbe46b6 100644 --- a/src/services/codefixes/importFixes.ts +++ b/src/services/codefixes/importFixes.ts @@ -50,7 +50,6 @@ import { getOutputExtension, getQuoteFromPreference, getQuotePreference, - getResolvedModule, getSourceFileOfNode, getSymbolId, getTokenAtPosition, @@ -179,7 +178,7 @@ registerCodeFix({ symbolName, fix, /*includeSymbolNameInDescription*/ symbolName !== errorIdentifierText, - program.getCompilerOptions(), + program, preferences, ) ); @@ -526,7 +525,6 @@ export function getImportCompletionAction( preferences: UserPreferences, cancellationToken: CancellationToken, ): { readonly moduleSpecifier: string; readonly codeAction: CodeAction; } { - const compilerOptions = program.getCompilerOptions(); let exportInfos; if (exportMapKey) { @@ -554,7 +552,7 @@ export function getImportCompletionAction( symbolName, fix, /*includeSymbolNameInDescription*/ false, - compilerOptions, + program, preferences, )), }; @@ -566,7 +564,15 @@ export function getPromoteTypeOnlyCompletionAction(sourceFile: SourceFile, symbo const symbolName = single(getSymbolNamesToImport(sourceFile, program.getTypeChecker(), symbolToken, compilerOptions)); const fix = getTypeOnlyPromotionFix(sourceFile, symbolToken, symbolName, program); const includeSymbolNameInDescription = symbolName !== symbolToken.text; - return fix && codeFixActionToCodeAction(codeActionForFix({ host, formatContext, preferences }, sourceFile, symbolName, fix, includeSymbolNameInDescription, compilerOptions, preferences)); + return fix && codeFixActionToCodeAction(codeActionForFix( + { host, formatContext, preferences }, + sourceFile, + symbolName, + fix, + includeSymbolNameInDescription, + program, + preferences, + )); } function getImportFixForSymbol(sourceFile: SourceFile, exportInfos: readonly SymbolExportInfo[], program: Program, position: number | undefined, isValidTypeOnlyUseSite: boolean, useRequire: boolean, host: LanguageServiceHost, preferences: UserPreferences) { @@ -1277,14 +1283,30 @@ function getExportEqualsImportKind(importingFile: SourceFile, compilerOptions: C return allowSyntheticDefaults ? ImportKind.Default : ImportKind.CommonJS; } -function codeActionForFix(context: textChanges.TextChangesContext, sourceFile: SourceFile, symbolName: string, fix: ImportFix, includeSymbolNameInDescription: boolean, compilerOptions: CompilerOptions, preferences: UserPreferences): CodeFixAction { +function codeActionForFix( + context: textChanges.TextChangesContext, + sourceFile: SourceFile, + symbolName: string, + fix: ImportFix, + includeSymbolNameInDescription: boolean, + program: Program, + preferences: UserPreferences, +): CodeFixAction { let diag!: DiagnosticOrDiagnosticAndArguments; const changes = textChanges.ChangeTracker.with(context, tracker => { - diag = codeActionForFixWorker(tracker, sourceFile, symbolName, fix, includeSymbolNameInDescription, compilerOptions, preferences); + diag = codeActionForFixWorker(tracker, sourceFile, symbolName, fix, includeSymbolNameInDescription, program, preferences); }); return createCodeFixAction(importFixName, changes, diag, importFixId, Diagnostics.Add_all_missing_imports); } -function codeActionForFixWorker(changes: textChanges.ChangeTracker, sourceFile: SourceFile, symbolName: string, fix: ImportFix, includeSymbolNameInDescription: boolean, compilerOptions: CompilerOptions, preferences: UserPreferences): DiagnosticOrDiagnosticAndArguments { +function codeActionForFixWorker( + changes: textChanges.ChangeTracker, + sourceFile: SourceFile, + symbolName: string, + fix: ImportFix, + includeSymbolNameInDescription: boolean, + program: Program, + preferences: UserPreferences, +): DiagnosticOrDiagnosticAndArguments { const quotePreference = getQuotePreference(sourceFile, preferences); switch (fix.kind) { case ImportFixKind.UseNamespace: @@ -1325,7 +1347,7 @@ function codeActionForFixWorker(changes: textChanges.ChangeTracker, sourceFile: defaultImport, namedImports, namespaceLikeImport, - compilerOptions, + program.getCompilerOptions(), ), /*blankLineBetween*/ true, preferences, @@ -1339,7 +1361,7 @@ function codeActionForFixWorker(changes: textChanges.ChangeTracker, sourceFile: } case ImportFixKind.PromoteTypeOnly: { const { typeOnlyAliasDeclaration } = fix; - const promotedDeclaration = promoteFromTypeOnly(changes, typeOnlyAliasDeclaration, compilerOptions, sourceFile, preferences); + const promotedDeclaration = promoteFromTypeOnly(changes, typeOnlyAliasDeclaration, program, sourceFile, preferences); return promotedDeclaration.kind === SyntaxKind.ImportSpecifier ? [Diagnostics.Remove_type_from_import_of_0_from_1, symbolName, getModuleSpecifierText(promotedDeclaration.parent.parent)] : [Diagnostics.Remove_type_from_import_declaration_from_0, getModuleSpecifierText(promotedDeclaration)]; @@ -1355,7 +1377,14 @@ function getModuleSpecifierText(promotedDeclaration: ImportClause | ImportEquals : cast(promotedDeclaration.parent.moduleSpecifier, isStringLiteral).text; } -function promoteFromTypeOnly(changes: textChanges.ChangeTracker, aliasDeclaration: TypeOnlyAliasDeclaration, compilerOptions: CompilerOptions, sourceFile: SourceFile, preferences: UserPreferences) { +function promoteFromTypeOnly( + changes: textChanges.ChangeTracker, + aliasDeclaration: TypeOnlyAliasDeclaration, + program: Program, + sourceFile: SourceFile, + preferences: UserPreferences, +) { + const compilerOptions = program.getCompilerOptions(); // See comment in `doAddExistingFix` on constant with the same name. const convertExistingToTypeOnly = importNameElisionDisabled(compilerOptions); switch (aliasDeclaration.kind) { @@ -1398,7 +1427,7 @@ function promoteFromTypeOnly(changes: textChanges.ChangeTracker, aliasDeclaratio // Change .ts extension to .js if necessary if (!compilerOptions.allowImportingTsExtensions) { const moduleSpecifier = tryGetModuleSpecifierFromDeclaration(importClause.parent); - const resolvedModule = moduleSpecifier && getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier)); + const resolvedModule = moduleSpecifier && program.resolvedModules?.get(sourceFile.path)?.get(moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier))?.resolvedModule; if (resolvedModule?.resolvedUsingTsExtension) { const changedExtension = changeAnyExtension(moduleSpecifier!.text, getOutputExtension(moduleSpecifier!.text, compilerOptions)); changes.replaceNode(sourceFile, moduleSpecifier!, factory.createStringLiteral(changedExtension)); diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts index 11a00e51954..bdf9884ad3f 100644 --- a/src/services/findAllReferences.ts +++ b/src/services/findAllReferences.ts @@ -1009,7 +1009,7 @@ export namespace Core { if (!options.implementations && isStringLiteralLike(node)) { if (isModuleSpecifierLike(node)) { const fileIncludeReasons = program.getFileIncludeReasons(); - const referencedFileName = node.getSourceFile().resolvedModules?.get(node.text, getModeForUsageLocation(node.getSourceFile(), node))?.resolvedModule?.resolvedFileName; + const referencedFileName = program.resolvedModules?.get(node.getSourceFile().path)?.get(node.text, getModeForUsageLocation(node.getSourceFile(), node))?.resolvedModule?.resolvedFileName; const referencedFile = referencedFileName ? program.getSourceFile(referencedFileName) : undefined; if (referencedFile) { return [{ definition: { type: DefinitionKind.String, node }, references: getReferencesForNonModule(referencedFile, fileIncludeReasons, program) || emptyArray }]; @@ -1066,7 +1066,7 @@ export namespace Core { for (const ref of references) { if (isReferencedFile(ref)) { const referencingFile = program.getSourceFileByPath(ref.file)!; - const location = getReferencedFileLocation(program.getSourceFileByPath, ref); + const location = getReferencedFileLocation(program, ref); if (isReferenceFileLocation(location)) { entries = append(entries, { kind: EntryKind.Span, diff --git a/src/services/getEditsForFileRename.ts b/src/services/getEditsForFileRename.ts index fdc4c1e4125..8b575408392 100644 --- a/src/services/getEditsForFileRename.ts +++ b/src/services/getEditsForFileRename.ts @@ -249,7 +249,7 @@ function getSourceFileToImport( else { const mode = getModeForUsageLocation(importingSourceFile, importLiteral); const resolved = host.resolveModuleNameLiterals || !host.resolveModuleNames ? - importingSourceFile.resolvedModules?.get(importLiteral.text, mode) : + program.resolvedModules?.get(importingSourceFile.path)?.get(importLiteral.text, mode) : host.getResolvedModuleWithFailedLookupLocationsFromCache && host.getResolvedModuleWithFailedLookupLocationsFromCache(importLiteral.text, importingSourceFile.fileName, mode); return getSourceFileToImportFromResolved(importLiteral, resolved, oldToNew, program.getSourceFiles()); } diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts index e622ed105d4..b7c31a473cb 100644 --- a/src/services/goToDefinition.ts +++ b/src/services/goToDefinition.ts @@ -179,7 +179,7 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile if (!symbol && isModuleSpecifierLike(fallbackNode)) { // We couldn't resolve the module specifier as an external module, but it could // be that module resolution succeeded but the target was not a module. - const ref = sourceFile.resolvedModules?.get(fallbackNode.text, getModeForUsageLocation(sourceFile, fallbackNode))?.resolvedModule; + const ref = program.resolvedModules?.get(sourceFile.path)?.get(fallbackNode.text, getModeForUsageLocation(sourceFile, fallbackNode))?.resolvedModule; if (ref) { return [{ name: fallbackNode.text, @@ -332,10 +332,11 @@ export function getReferenceAtPosition(sourceFile: SourceFile, position: number, return file && { reference: libReferenceDirective, fileName: file.fileName, file, unverified: false }; } - if (sourceFile.resolvedModules?.size()) { + const resolvedModules = program.resolvedModules?.get(sourceFile.path); + if (resolvedModules?.size()) { const node = getTouchingToken(sourceFile, position); - if (isModuleSpecifierLike(node) && isExternalModuleNameRelative(node.text) && sourceFile.resolvedModules.has(node.text, getModeForUsageLocation(sourceFile, node))) { - const verifiedFileName = sourceFile.resolvedModules.get(node.text, getModeForUsageLocation(sourceFile, node))?.resolvedModule?.resolvedFileName; + if (isModuleSpecifierLike(node) && isExternalModuleNameRelative(node.text) && resolvedModules.has(node.text, getModeForUsageLocation(sourceFile, node))) { + const verifiedFileName = resolvedModules.get(node.text, getModeForUsageLocation(sourceFile, node))?.resolvedModule?.resolvedFileName; const fileName = verifiedFileName || resolvePath(getDirectoryPath(sourceFile.fileName), node.text); return { file: program.getSourceFile(fileName), diff --git a/src/services/refactors/moveToFile.ts b/src/services/refactors/moveToFile.ts index 352c9043b40..6aa33130a95 100644 --- a/src/services/refactors/moveToFile.ts +++ b/src/services/refactors/moveToFile.ts @@ -310,7 +310,7 @@ function getTargetFileImportsAndAddExportInOldFile( forEachImportInStatement(oldStatement, i => { // Recomputing module specifier const moduleSpecifier = moduleSpecifierFromImport(i); - const resolved = oldFile.resolvedModules?.get(moduleSpecifier.text, getModeForUsageLocation(oldFile, moduleSpecifier)); + const resolved = program.resolvedModules?.get(oldFile.path)?.get(moduleSpecifier.text, getModeForUsageLocation(oldFile, moduleSpecifier)); const fileName = resolved?.resolvedModule?.resolvedFileName; if (fileName && targetSourceFile) { const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), targetSourceFile, targetSourceFile.path, fileName, createModuleSpecifierResolutionHost(program, host)); diff --git a/src/services/services.ts b/src/services/services.ts index 7da1e0bff91..3e3da71e481 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -212,7 +212,6 @@ import { mapOneOrMany, maybeBind, maybeSetLocalizedDiagnosticMessages, - ModeAwareCache, ModifierFlags, ModuleDeclaration, NavigateToItem, @@ -256,9 +255,7 @@ import { RenameInfo, RenameInfoOptions, RenameLocation, - ResolvedModuleWithFailedLookupLocations, ResolvedProjectReference, - ResolvedTypeReferenceDirectiveWithFailedLookupLocations, returnFalse, scanner, ScriptElementKind, @@ -1042,8 +1039,6 @@ class SourceFileObject extends NodeObject implements SourceFile { public languageVariant!: LanguageVariant; public identifiers!: Map; public nameTable: Map<__String, number> | undefined; - public resolvedModules: ModeAwareCache | undefined; - public resolvedTypeReferenceDirectiveNames!: ModeAwareCache; public imports!: readonly StringLiteralLike[]; public moduleAugmentations!: StringLiteral[]; private namedDeclarations: Map | undefined; diff --git a/src/services/suggestionDiagnostics.ts b/src/services/suggestionDiagnostics.ts index a11fedee2ac..fc72c0289bc 100644 --- a/src/services/suggestionDiagnostics.ts +++ b/src/services/suggestionDiagnostics.ts @@ -24,7 +24,6 @@ import { getAssignmentDeclarationKind, getFunctionFlags, getModeForUsageLocation, - getResolvedModule, hasInitializer, hasPropertyAccessExpressionWithName, Identifier, @@ -89,7 +88,7 @@ export function computeSuggestionDiagnostics(sourceFile: SourceFile, program: Pr const importNode = importFromModuleSpecifier(moduleSpecifier); const name = importNameForConvertToDefaultImport(importNode); if (!name) continue; - const module = getResolvedModule(sourceFile, moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier)); + const module = program.resolvedModules?.get(sourceFile.path)?.get(moduleSpecifier.text, getModeForUsageLocation(sourceFile, moduleSpecifier))?.resolvedModule; const resolvedFile = module && program.getSourceFile(module.resolvedFileName); if (resolvedFile && resolvedFile.externalModuleIndicator && resolvedFile.externalModuleIndicator !== true && isExportAssignment(resolvedFile.externalModuleIndicator) && resolvedFile.externalModuleIndicator.isExportEquals) { diags.push(createDiagnosticForNode(name, Diagnostics.Import_may_be_converted_to_a_default_import)); diff --git a/src/testRunner/unittests/reuseProgramStructure.ts b/src/testRunner/unittests/reuseProgramStructure.ts index e066c5a3345..c1bf71a3c8e 100644 --- a/src/testRunner/unittests/reuseProgramStructure.ts +++ b/src/testRunner/unittests/reuseProgramStructure.ts @@ -27,8 +27,8 @@ describe("unittests:: Reuse program structure:: General", () => { baselines.push(`Program Reused:: ${(ts as any).StructureIsReused[program.structureIsReused]}`); program.getSourceFiles().forEach(f => { baselines.push(`File: ${f.fileName}`, f.text); - baselineCache(baselines, "resolvedModules", f.resolvedModules); - baselineCache(baselines, "resolvedTypeReferenceDirectiveNames", f.resolvedTypeReferenceDirectiveNames); + baselineCache(baselines, "resolvedModules", program.resolvedModules?.get(f.path)); + baselineCache(baselines, "resolvedTypeReferenceDirectiveNames", program.resolvedTypeReferenceDirectiveNames?.get(f.path)); baselines.push(""); }); host ??= (program as ProgramWithSourceTexts).host; diff --git a/src/testRunner/unittests/tsserver/symlinkCache.ts b/src/testRunner/unittests/tsserver/symlinkCache.ts index 38536a64b49..796f0fec2d7 100644 --- a/src/testRunner/unittests/tsserver/symlinkCache.ts +++ b/src/testRunner/unittests/tsserver/symlinkCache.ts @@ -82,7 +82,7 @@ describe("unittests:: tsserver:: symlinkCache", () => { resolvedFileName: "/one/two/foo", }, }); - cache.setSymlinksFromResolutions([], map); + cache.setSymlinksFromResolutions(/*resolvedModules*/ undefined, /*resolvedTypeReferenceDirectiveNames*/ undefined, map); }); }); diff --git a/src/testRunner/unittests/tsserver/typingsInstaller.ts b/src/testRunner/unittests/tsserver/typingsInstaller.ts index 8abd6474a9f..70643697391 100644 --- a/src/testRunner/unittests/tsserver/typingsInstaller.ts +++ b/src/testRunner/unittests/tsserver/typingsInstaller.ts @@ -2312,7 +2312,9 @@ describe("unittests:: tsserver:: typingsInstaller:: recomputing resolutions of u const foooPath = "/a/b/node_modules/fooo/index.d.ts"; function verifyResolvedModuleOfFooo(project: ts.server.Project) { ts.server.updateProjectIfDirty(project); - const foooResolution = project.getLanguageService().getProgram()!.getSourceFileByPath(appPath)!.resolvedModules!.get("fooo", /*mode*/ undefined)!.resolvedModule!; + const program = project.getLanguageService().getProgram()!; + const sourceFile = program.getSourceFileByPath(appPath)!; + const foooResolution = program.resolvedModules!.get(sourceFile.path)!.get("fooo", /*mode*/ undefined)!.resolvedModule!; assert.equal(foooResolution.resolvedFileName, foooPath); return foooResolution; } diff --git a/tests/baselines/reference/nodeColonModuleResolution.trace.json b/tests/baselines/reference/nodeColonModuleResolution.trace.json index 7409758f7fb..65af448d3ec 100644 --- a/tests/baselines/reference/nodeColonModuleResolution.trace.json +++ b/tests/baselines/reference/nodeColonModuleResolution.trace.json @@ -1,4 +1,5 @@ [ + "Module 'ph' was resolved as locally declared ambient module in file '/a/b/node_modules/@types/node/ph.d.ts'.", "======== Resolving module 'node:ph' from '/a/b/main.ts'. ========", "Explicitly specified module resolution kind: 'Node10'.", "Skipping module 'node:ph' that looks like an absolute URI, target file types: TypeScript, Declaration.", diff --git a/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js b/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js index fb5aff08f7a..9be7576e028 100644 --- a/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js +++ b/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js @@ -69,7 +69,7 @@ Info seq [hh:mm:ss:mss] Open files: Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/index.ts ProjectRootPath: undefined Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/tsconfig.json DocumentRegistry:: - Key:: undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined + Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined /user/username/projects/myproject/index.ts: TS 1 /user/username/projects/myproject/module1.d.ts: TS 1 /a/lib/lib.d.ts: TS 1 @@ -88,7 +88,7 @@ Info seq [hh:mm:ss:mss] Files (2) Info seq [hh:mm:ss:mss] ----------------------------------------------- DocumentRegistry:: - Key:: undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined + Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined /user/username/projects/myproject/index.ts: TS 1 /a/lib/lib.d.ts: TS 1 Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/module1.d.ts 1:: WatchInfo: /user/username/projects/myproject/module1.d.ts 500 undefined WatchType: Closed Script info @@ -111,7 +111,7 @@ Info seq [hh:mm:ss:mss] Files (3) Info seq [hh:mm:ss:mss] ----------------------------------------------- DocumentRegistry:: - Key:: undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined + Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined /user/username/projects/myproject/index.ts: TS 1 /a/lib/lib.d.ts: TS 1 /user/username/projects/myproject/module1.d.ts: TS 1 \ No newline at end of file diff --git a/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js b/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js index 4c987008954..41814d3b60e 100644 --- a/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js +++ b/tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js @@ -69,7 +69,7 @@ Info seq [hh:mm:ss:mss] Open files: Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/index.ts ProjectRootPath: undefined Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/tsconfig.json DocumentRegistry:: - Key:: undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined + Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined /user/username/projects/myproject/index.ts: TS 1 /user/username/projects/myproject/module1.d.ts: TS 1 /a/lib/lib.d.ts: TS 1 @@ -88,7 +88,7 @@ Info seq [hh:mm:ss:mss] Files (2) Info seq [hh:mm:ss:mss] ----------------------------------------------- DocumentRegistry:: - Key:: undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined + Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined /user/username/projects/myproject/index.ts: TS 1 /a/lib/lib.d.ts: TS 1 Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json @@ -109,7 +109,7 @@ Info seq [hh:mm:ss:mss] Files (3) Info seq [hh:mm:ss:mss] ----------------------------------------------- DocumentRegistry:: - Key:: undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined + Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined /user/username/projects/myproject/index.ts: TS 1 /a/lib/lib.d.ts: TS 1 /user/username/projects/myproject/module1.d.ts: TS 1 \ No newline at end of file