allow to compute change ranges only for snapshots from the same script version cache

vladima · vladima · commit dda24f6d70d9 · 2016-12-14T14:43:45.000-08:00
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1799,7 +1799,6 @@ namespace ts.projectSystem {
         });
 
         it("language service disabled state is updated in external projects", () => {
-            debugger
             const f1 = {
                 path: "/a/app.js",
                 content: "var x = 1"
@@ -1940,6 +1939,32 @@ namespace ts.projectSystem {
             const edits = project.getLanguageService().getFormattingEditsForDocument(f1.path, options);
             assert.deepEqual(edits, [{ span: createTextSpan(/*start*/ 7, /*length*/ 3), newText: " " }]);
         });
+
+        it("snapshot from different caches are incompatible", () => {
+            const f1 = {
+                path: "/a/b/app.ts",
+                content: "let x = 1;"
+            };
+            debugger
+            const host = createServerHost([f1]);
+            const projectFileName = "/a/b/proj.csproj";
+            const projectService = createProjectService(host);
+            projectService.openExternalProject({
+                projectFileName,
+                rootFiles: [toExternalFile(f1.path)],
+                options: {}
+            })
+            projectService.openClientFile(f1.path, "let x = 1;\nlet y = 2;");
+
+            projectService.checkNumberOfProjects({ externalProjects: 1 });
+            projectService.externalProjects[0].getLanguageService(/*ensureSynchronized*/false).getNavigationBarItems(f1.path);
+            projectService.closeClientFile(f1.path);
+
+            projectService.openClientFile(f1.path);
+            projectService.checkNumberOfProjects({ externalProjects: 1 });
+            const navbar = projectService.externalProjects[0].getLanguageService(/*ensureSynchronized*/false).getNavigationBarItems(f1.path);
+            assert.equal(navbar[0].spans[0].length, f1.content.length);
+        });
     });
 
     describe("Proper errors", () => {
diff --git a/src/server/scriptVersionCache.ts b/src/server/scriptVersionCache.ts
@@ -398,7 +398,7 @@ namespace ts.server {
         index: LineIndex;
         changesSincePreviousVersion: TextChange[] = [];
 
-        constructor(public version: number, public cache: ScriptVersionCache) {
+        constructor(readonly version: number, readonly cache: ScriptVersionCache) {
         }
 
         getText(rangeStart: number, rangeEnd: number) {
@@ -438,7 +438,7 @@ namespace ts.server {
             }
         }
         getChangeRange(oldSnapshot: ts.IScriptSnapshot): ts.TextChangeRange {
-            if (oldSnapshot instanceof LineIndexSnapshot) {
+            if (oldSnapshot instanceof LineIndexSnapshot && this.cache === oldSnapshot.cache) {
                 return this.getTextChangeRangeSinceVersion(oldSnapshot.version);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ namespace ts.server {`
`398`	`398`	`index: LineIndex;`
`399`	`399`	`changesSincePreviousVersion: TextChange[] = [];`
`400`	`400`
`401`		`- constructor(public version: number, public cache: ScriptVersionCache) {`
	`401`	`+ constructor(readonly version: number, readonly cache: ScriptVersionCache) {`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`getText(rangeStart: number, rangeEnd: number) {`
`@@ -438,7 +438,7 @@ namespace ts.server {`
`438`	`438`	`}`
`439`	`439`	`}`
`440`	`440`	`getChangeRange(oldSnapshot: ts.IScriptSnapshot): ts.TextChangeRange {`
`441`		`- if (oldSnapshot instanceof LineIndexSnapshot) {`
	`441`	`+ if (oldSnapshot instanceof LineIndexSnapshot && this.cache === oldSnapshot.cache) {`
`442`	`442`	`return this.getTextChangeRangeSinceVersion(oldSnapshot.version);`
`443`	`443`	`}`
`444`	`444`	`}`