maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #26137 from Microsoft/updateGraphIfDirty

Browse source 
Use updateGraphIfDirty to do quick check if project update is needed
This commit is contained in:
Sheetal Nandi 2018-08-02 16:32:36 -07:00 committed by GitHub
commit 9df88316a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/server/editorServices.ts
View file

@ -337,7 +337,8 @@ namespace ts.server {
return `Project: ${project ? project.getProjectName() : ""} WatchType: ${watchType}`;
}
function updateProjectIfDirty(project: Project) {
/*@internal*/
export function updateProjectIfDirty(project: Project) {
return project.dirty && project.updateGraph();
}
@ -617,7 +618,7 @@ namespace ts.server {
this.pendingProjectUpdates.set(projectName, project);
this.throttledOperations.schedule(projectName, /*delay*/ 250, () => {
if (this.pendingProjectUpdates.delete(projectName)) {
project.updateGraph();
updateProjectIfDirty(project);
}
});
}
@ -2148,7 +2149,7 @@ namespace ts.server {
private findExternalProjectContainingOpenScriptInfo(info: ScriptInfo): ExternalProject | undefined {
return find(this.externalProjects, proj => {
// Ensure project structure is up-to-date to check if info is present in external project
proj.updateGraph();
updateProjectIfDirty(proj);
return proj.containsScriptInfo(info);
});
}

10
src/server/project.ts
View file

@ -164,12 +164,12 @@ namespace ts.server {
private readonly cancellationToken: ThrottledCancellationToken;
public isNonTsProject() {
this.updateGraph();
updateProjectIfDirty(this);
return allFilesAreJsOrDts(this);
}
public isJsOnlyProject() {
this.updateGraph();
updateProjectIfDirty(this);
return hasOneOrMoreJsAndNoTsFiles(this);
}
@ -459,7 +459,7 @@ namespace ts.server {
getLanguageService(ensureSynchronized = true): LanguageService {
if (ensureSynchronized) {
this.updateGraph();
updateProjectIfDirty(this);
}
return this.languageService;
}
@ -477,7 +477,7 @@ namespace ts.server {
if (!this.languageServiceEnabled) {
return [];
}
this.updateGraph();
updateProjectIfDirty(this);
this.builderState = BuilderState.create(this.program, this.projectService.toCanonicalFileName, this.builderState);
return mapDefined(BuilderState.getFilesAffectedBy(this.builderState, this.program, scriptInfo.path, this.cancellationToken, data => this.projectService.host.createHash!(data)), // TODO: GH#18217
sourceFile => this.shouldEmitFile(this.projectService.getScriptInfoForPath(sourceFile.path)!) ? sourceFile.fileName : undefined);
@ -1025,7 +1025,7 @@ namespace ts.server {
/* @internal */
getChangesSinceVersion(lastKnownVersion?: number): ProjectFilesWithTSDiagnostics {
this.updateGraph();
updateProjectIfDirty(this);
const info: protocol.ProjectVersionInfo = {
projectName: this.getProjectName(),

4
src/server/session.ts
View file

@ -695,7 +695,7 @@ namespace ts.server {
const { fileName, project } = checkList[index];
index++;
// Ensure the project is upto date before checking if this file is present in the project
project.updateGraph();
updateProjectIfDirty(project);
if (!project.containsFile(fileName, requireOpen)) {
return;
}
@ -1084,7 +1084,7 @@ namespace ts.server {
private getProjectInfoWorker(uncheckedFileName: string, projectFileName: string | undefined, needFileNameList: boolean, excludeConfigFiles: boolean) {
const { project } = this.getFileAndProjectWorker(uncheckedFileName, projectFileName);
project.updateGraph();
updateProjectIfDirty(project);
const projectInfo = {
configFileName: project.getProjectName(),
languageServiceDisabled: !project.languageServiceEnabled,