microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 03:23:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Handle the deleted file in update graph better, so that in next update it is possible to schedule the update graph of project

Browse Source
This commit is contained in:
Sheetal Nandi 2017-07-10 14:32:36 -07:00
parent df6f75bc70
commit 9ff9476b4a
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/types.ts
View File

@ -3975,6 +3975,8 @@ namespace ts {
resolvedModule: ResolvedModuleFull | undefined;
/* @internal */
failedLookupLocations: string[];
/*@internal*/
isInvalidated?: boolean;
}
export interface ResolvedTypeReferenceDirective {
@ -3987,6 +3989,8 @@ namespace ts {
export interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective;
failedLookupLocations: string[];
/*@internal*/
isInvalidated?: boolean;
}
export interface CompilerHost extends ModuleResolutionHost {

4
src/server/editorServices.ts
View File

@ -361,8 +361,6 @@ namespace ts.server {
readonly toCanonicalFileName: (f: string) => string;
public lastDeletedFile: ScriptInfo;
public readonly host: ServerHost;
public readonly logger: Logger;
public readonly cancellationToken: HostCancellationToken;
@ -571,7 +569,6 @@ namespace ts.server {
if (!info.isScriptOpen()) {
this.filenameToScriptInfo.delete(info.path);
this.lastDeletedFile = info;
// capture list of projects since detachAllProjects will wipe out original list
const containingProjects = info.containingProjects.slice();
@ -580,7 +577,6 @@ namespace ts.server {
// update projects to make sure that set of referenced files is correct
this.updateProjectGraphs(containingProjects);
this.lastDeletedFile = undefined;
if (!this.eventHandler) {
return;

40
src/server/lsHost.ts
View File

@ -3,6 +3,7 @@
/// <reference path="scriptInfo.ts" />
namespace ts.server {
type NameResolutionWithFailedLookupLocations = { failedLookupLocations: string[], isInvalidated?: boolean };
export class LSHost implements ts.LanguageServiceHost, ModuleResolutionHost {
private compilationSettings: ts.CompilerOptions;
private readonly resolvedModuleNames = createMap<Map<ResolvedModuleWithFailedLookupLocations>>();
@ -62,7 +63,7 @@ namespace ts.server {
return collected;
}
private resolveNamesWithLocalCache<T extends { failedLookupLocations: string[] }, R>(
private resolveNamesWithLocalCache<T extends NameResolutionWithFailedLookupLocations, R>(
names: string[],
containingFile: string,
cache: Map<Map<T>>,
@ -77,7 +78,6 @@ namespace ts.server {
const newResolutions: Map<T> = createMap<T>();
const resolvedModules: R[] = [];
const compilerOptions = this.getCompilationSettings();
const lastDeletedFileName = this.project.projectService.lastDeletedFile && this.project.projectService.lastDeletedFile.fileName;
for (const name of names) {
// check if this is a duplicate entry in the list
@ -112,7 +112,7 @@ namespace ts.server {
if (oldResolution === newResolution) {
return true;
}
if (!oldResolution || !newResolution) {
if (!oldResolution || !newResolution || oldResolution.isInvalidated) {
return false;
}
const oldResult = getResult(oldResolution);
@ -127,13 +127,13 @@ namespace ts.server {
}
function moduleResolutionIsValid(resolution: T): boolean {
if (!resolution) {
if (!resolution || resolution.isInvalidated) {
return false;
}
const result = getResult(resolution);
if (result) {
return getResultFileName(result) !== lastDeletedFileName;
return true;
}
// consider situation if we have no candidate locations as valid resolution.
@ -234,8 +234,34 @@ namespace ts.server {
}
notifyFileRemoved(info: ScriptInfo) {
this.resolvedModuleNames.delete(info.path);
this.resolvedTypeReferenceDirectives.delete(info.path);
this.invalidateResolutionOfDeletedFile(info, this.resolvedModuleNames,
m => m.resolvedModule, r => r.resolvedFileName);
this.invalidateResolutionOfDeletedFile(info, this.resolvedTypeReferenceDirectives,
m => m.resolvedTypeReferenceDirective, r => r.resolvedFileName);
}
private invalidateResolutionOfDeletedFile<T extends NameResolutionWithFailedLookupLocations, R>(
deletedInfo: ScriptInfo,
cache: Map<Map<T>>,
getResult: (s: T) => R,
getResultFileName: (result: R) => string | undefined) {
cache.forEach((value, path) => {
if (path === deletedInfo.path) {
cache.delete(path);
}
else if (value) {
value.forEach((resolution) => {
if (resolution && !resolution.isInvalidated) {
const result = getResult(resolution);
if (result) {
if (getResultFileName(result) === deletedInfo.path) {
resolution.isInvalidated = true;
}
}
}
});
}
});
}
setCompilationSettings(opt: ts.CompilerOptions) {