call updateGraph before getting language service

vladima · vladima · commit bb016148da1c · 2016-07-22T16:01:54.000-07:00
diff --git a/src/harness/unittests/cachingInServerLSHost.ts b/src/harness/unittests/cachingInServerLSHost.ts
@@ -110,7 +110,7 @@ namespace ts {
             const { project, rootScriptInfo } = createProject(root.name, serverHost);
 
             // ensure that imported file was found
-            let diags = project.languageService.getSemanticDiagnostics(imported.name);
+            let diags = project.getLanguageService().getSemanticDiagnostics(imported.name);
             assert.equal(diags.length, 1);
 
 
@@ -126,7 +126,7 @@ namespace ts {
                 var x: string = 1;`;
                 rootScriptInfo.editContent(0, root.content.length, newContent);
                 // trigger synchronization to make sure that import will be fetched from the cache
-                diags = project.languageService.getSemanticDiagnostics(imported.name);
+                diags = project.getLanguageService().getSemanticDiagnostics(imported.name);
                 // ensure file has correct number of errors after edit
                 assert.equal(diags.length, 1);
             }
@@ -145,7 +145,7 @@ namespace ts {
 
                 try {
                     // trigger synchronization to make sure that LSHost will try to find 'f2' module on disk
-                    project.languageService.getSemanticDiagnostics(imported.name);
+                    project.getLanguageService().getSemanticDiagnostics(imported.name);
                     assert.isTrue(false, `should not find file '${imported.name}'`);
                 }
                 catch (e) {
@@ -167,7 +167,7 @@ namespace ts {
 
                 const newContent = `import {x} from "f1"`;
                 rootScriptInfo.editContent(0, root.content.length, newContent);
-                project.languageService.getSemanticDiagnostics(imported.name);
+                project.getLanguageService().getSemanticDiagnostics(imported.name);
                 assert.isTrue(fileExistsCalled);
 
                 // setting compiler options discards module resolution cache
@@ -177,7 +177,7 @@ namespace ts {
                 compilerOptions.target = ts.ScriptTarget.ES5;
                 project.setCompilerOptions(compilerOptions);
 
-                project.languageService.getSemanticDiagnostics(imported.name);
+                project.getLanguageService().getSemanticDiagnostics(imported.name);
                 assert.isTrue(fileExistsCalled);
             }
         });
@@ -211,7 +211,7 @@ namespace ts {
 
             const { project, rootScriptInfo } = createProject(root.name, serverHost);
 
-            let diags = project.languageService.getSemanticDiagnostics(root.name);
+            let diags = project.getLanguageService().getSemanticDiagnostics(root.name);
             assert.isTrue(fileExistsCalledForBar, "'fileExists' should be called");
             assert.isTrue(diags.length === 1, "one diagnostic expected");
             assert.isTrue(typeof diags[0].messageText === "string" && ((<string>diags[0].messageText).indexOf("Cannot find module") === 0), "should be 'cannot find module' message");
@@ -221,7 +221,7 @@ namespace ts {
             fileExistsCalledForBar = false;
             rootScriptInfo.editContent(0, root.content.length, `import {y} from "bar"`);
 
-            diags = project.languageService.getSemanticDiagnostics(root.name);
+            diags = project.getLanguageService().getSemanticDiagnostics(root.name);
             assert.isTrue(fileExistsCalledForBar, "'fileExists' should be called");
             assert.isTrue(diags.length === 0);
         });
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -24,7 +24,7 @@ namespace ts.server {
         private lsHost: ServerLanguageServiceHost;
         private program: ts.Program;
 
-        languageService: LanguageService;
+        private languageService: LanguageService;
 
         /**
          * Set of files that was returned from the last call to getChangesSinceVersion.
@@ -74,6 +74,13 @@ namespace ts.server {
             this.markAsDirty();
         }
 
+        getLanguageService(ensureSynchronized = true): LanguageService  {
+            if (ensureSynchronized) {
+                this.updateGraph();
+            }
+            return this.languageService;
+        }
+
         getProjectVersion() {
             return this.projectStateVersion.toString();
         }
@@ -225,6 +232,7 @@ namespace ts.server {
                     }
                 }
             }
+
             return oldProjectStructureVersion === this.projectStructureVersion;
         }
 
@@ -278,6 +286,8 @@ namespace ts.server {
         }
 
         getChangesSinceVersion(lastKnownVersion?: number): protocol.ProjectFiles {
+            this.updateGraph();
+
             const info = {
                 projectName: this.getProjectName(),
                 version: this.projectStructureVersion,
diff --git a/src/server/session.ts b/src/server/session.ts

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace ts.server {`
`24`	`24`	`private lsHost: ServerLanguageServiceHost;`
`25`	`25`	`private program: ts.Program;`
`26`	`26`
`27`		`- languageService: LanguageService;`
	`27`	`+ private languageService: LanguageService;`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* Set of files that was returned from the last call to getChangesSinceVersion.`
`@@ -74,6 +74,13 @@ namespace ts.server {`
`74`	`74`	`this.markAsDirty();`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ getLanguageService(ensureSynchronized = true): LanguageService {`
	`78`	`+ if (ensureSynchronized) {`
	`79`	`+ this.updateGraph();`
	`80`	`+ }`
	`81`	`+ return this.languageService;`
	`82`	`+ }`
	`83`	`+`
`77`	`84`	`getProjectVersion() {`
`78`	`85`	`return this.projectStateVersion.toString();`
`79`	`86`	`}`
`@@ -225,6 +232,7 @@ namespace ts.server {`
`225`	`232`	`}`
`226`	`233`	`}`
`227`	`234`	`}`
	`235`	`+`
`228`	`236`	`return oldProjectStructureVersion === this.projectStructureVersion;`
`229`	`237`	`}`
`230`	`238`
`@@ -278,6 +286,8 @@ namespace ts.server {`
`278`	`286`	`}`
`279`	`287`
`280`	`288`	`getChangesSinceVersion(lastKnownVersion?: number): protocol.ProjectFiles {`
	`289`	`+ this.updateGraph();`
	`290`	`+`
`281`	`291`	`const info = {`
`282`	`292`	`projectName: this.getProjectName(),`
`283`	`293`	`version: this.projectStructureVersion,`