Merge pull request microsoft#26137 from Microsoft/updateGraphIfDirty

sheetalkamat · web-flow · commit 9df88316a2f2 · 2018-08-02T16:32:36.000-07:00
Use updateGraphIfDirty to do quick check if project update is needed
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -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);
             });
         }
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -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(),
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,8 @@ namespace ts.server {`
`337`	`337`	return `Project: ${project ? project.getProjectName() : ""} WatchType: ${watchType}`;
`338`	`338`	`}`
`339`	`339`
`340`		`- function updateProjectIfDirty(project: Project) {`
	`340`	`+ /@internal/`
	`341`	`+ export function updateProjectIfDirty(project: Project) {`
`341`	`342`	`return project.dirty && project.updateGraph();`
`342`	`343`	`}`
`343`	`344`
`@@ -617,7 +618,7 @@ namespace ts.server {`
`617`	`618`	`this.pendingProjectUpdates.set(projectName, project);`
`618`	`619`	`this.throttledOperations.schedule(projectName, /delay/ 250, () => {`
`619`	`620`	`if (this.pendingProjectUpdates.delete(projectName)) {`
`620`		`- project.updateGraph();`
	`621`	`+ updateProjectIfDirty(project);`
`621`	`622`	`}`
`622`	`623`	`});`
`623`	`624`	`}`
`@@ -2148,7 +2149,7 @@ namespace ts.server {`
`2148`	`2149`	`private findExternalProjectContainingOpenScriptInfo(info: ScriptInfo): ExternalProject \| undefined {`
`2149`	`2150`	`return find(this.externalProjects, proj => {`
`2150`	`2151`	`// Ensure project structure is up-to-date to check if info is present in external project`
`2151`		`- proj.updateGraph();`
	`2152`	`+ updateProjectIfDirty(proj);`
`2152`	`2153`	`return proj.containsScriptInfo(info);`
`2153`	`2154`	`});`
`2154`	`2155`	`}`