Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify resolution cache to update on program creation completion

Browse Source
This commit is contained in:
Sheetal Nandi
2022-12-09 14:49:26 -08:00
parent 591960edb0
commit 71ebed9c00
297 changed files with 3496 additions and 3485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/editorServices.ts
-1
View File
@@ -1585,7 +1585,6 @@ export class ProjectService {
}
else {
// Change in referenced project config file
project.resolutionCache.removeResolutionsFromProjectReferenceRedirects(this.toPath(canonicalConfigFilePath));
this.delayUpdateProjectGraph(project);
}
});
src/server/project.ts
+5 -20
View File
@@ -929,6 +929,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
}
Debug.assert(this.projectService.serverMode !== LanguageServiceMode.Syntactic);
this.languageService.cleanupSemanticCache();
this.resolutionCache.clear();
this.languageServiceEnabled = false;
this.lastFileExceededProgramSize = lastFileExceededProgramSize;
this.builderState = undefined;
@@ -936,7 +937,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
this.autoImportProviderHost.close();
}
this.autoImportProviderHost = undefined;
this.resolutionCache.closeTypeRootsWatch();
this.clearGeneratedFileWatch();
this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ false);
}
@@ -1191,11 +1191,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
if (this.isRoot(info)) {
this.removeRoot(info);
}
if (fileExists) {
// If file is present, just remove the resolutions for the file
this.resolutionCache.removeResolutionsOfFile(info.path);
}
else {
if (!fileExists) {
this.resolutionCache.invalidateResolutionOfFile(info.path);
}
this.cachedUnresolvedImportsPerFile.delete(info.path);
@@ -1367,7 +1363,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
if (!newFile || (f.resolvedPath === f.path && newFile.resolvedPath !== f.path)) {
// new program does not contain this file - detach it from the project
// - remove resolutions only if the new program doesnt contain source file by the path (not resolvedPath since path is used for resolution)
this.detachScriptInfoFromProject(f.fileName, !!this.program.getSourceFileByPath(f.path));
this.detachScriptInfoFromProject(f.fileName);
}
}
@@ -1418,11 +1414,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
}
}
}
// Watch the type locations that would be added to program as part of automatic type resolutions
if (this.languageServiceEnabled && this.projectService.serverMode === LanguageServiceMode.Semantic) {
this.resolutionCache.updateTypeRootsWatch();
}
}
if (this.exportMapCache && !this.exportMapCache.isEmpty()) {
@@ -1481,14 +1472,8 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
this.projectService.sendPerformanceEvent(kind, durationMs);
}
private detachScriptInfoFromProject(uncheckedFileName: string, noRemoveResolution?: boolean) {
const scriptInfoToDetach = this.projectService.getScriptInfo(uncheckedFileName);
if (scriptInfoToDetach) {
scriptInfoToDetach.detachFromProject(this);
if (!noRemoveResolution) {
this.resolutionCache.removeResolutionsOfFile(scriptInfoToDetach.path);
}
}
private detachScriptInfoFromProject(uncheckedFileName: string) {
this.projectService.getScriptInfo(uncheckedFileName)?.detachFromProject(this);
}
private addMissingFileWatcher(missingFilePath: Path) {