Remove isOpen from souceFile and LanugageServiceHost interfaces

mhegazy · mhegazy · commit 66f8257fc843 · 2015-01-16T21:23:51.000-08:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1391,7 +1391,7 @@ module FourSlash {
             var content = snapshot.getText(0, snapshot.getLength());
 
             var referenceSourceFile = ts.createLanguageServiceSourceFile(
-                this.activeFile.fileName, createScriptSnapShot(content), ts.ScriptTarget.Latest, /*version:*/ "0", /*isOpen:*/ false, /*setNodeParents:*/ false);
+                this.activeFile.fileName, createScriptSnapShot(content), ts.ScriptTarget.Latest, /*version:*/ "0", /*setNodeParents:*/ false);
             var referenceSyntaxDiagnostics = referenceSourceFile.getSyntacticDiagnostics();
 
             Utils.assertDiagnosticsEquals(incrementalSyntaxDiagnostics, referenceSyntaxDiagnostics);
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -7,7 +7,7 @@ module Harness.LanguageService {
         public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = [];
         public lineMap: number[] = null;
 
-        constructor(public fileName: string, public content: string, public isOpen = true) {
+        constructor(public fileName: string, public content: string) {
             this.setContent(content);
         }
 
@@ -109,11 +109,9 @@ module Harness.LanguageService {
             fileName: string,
             compilationSettings: ts.CompilerOptions,
             scriptSnapshot: ts.IScriptSnapshot,
-            version: string,
-            isOpen: boolean): ts.SourceFile {
+            version: string): ts.SourceFile {
             var sourceFile = ts.createSourceFile(fileName, scriptSnapshot.getText(0, scriptSnapshot.getLength()), compilationSettings.target);
             sourceFile.version = version;
-            sourceFile.isOpen = isOpen;
             return sourceFile;
         }
 
@@ -123,10 +121,9 @@ module Harness.LanguageService {
             compilationSettings: ts.CompilerOptions,
             scriptSnapshot: ts.IScriptSnapshot,
             version: string,
-            isOpen: boolean,
             textChangeRange: ts.TextChangeRange
             ): ts.SourceFile {
-            return ts.updateLanguageServiceSourceFile(document, scriptSnapshot, version, isOpen, textChangeRange);
+            return ts.updateLanguageServiceSourceFile(document, scriptSnapshot, version, textChangeRange);
         }
 
         public releaseDocument(fileName: string, compilationSettings: ts.CompilerOptions): void {
@@ -231,10 +228,6 @@ module Harness.LanguageService {
             return this.getScriptInfo(fileName).version.toString();
         }
 
-        public getScriptIsOpen(fileName: string): boolean {
-            return this.getScriptInfo(fileName).isOpen;
-        }
-
         public getLocalizedDiagnosticMessages(): string {
             return JSON.stringify({});
         }
@@ -268,7 +261,6 @@ module Harness.LanguageService {
         public parseSourceText(fileName: string, sourceText: ts.IScriptSnapshot): ts.SourceFile {
             var result = ts.createSourceFile(fileName, sourceText.getText(0, sourceText.getLength()), ts.ScriptTarget.Latest);
             result.version = "1";
-            result.isOpen = true;
             return result;
         }
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -56,7 +56,6 @@ module ts {
     }
 
     export interface SourceFile {
-        isOpen: boolean;
         version: string;
         scriptSnapshot: IScriptSnapshot;
 
@@ -747,7 +746,6 @@ module ts {
         public identifierCount: number;
         public symbolCount: number;
         public version: string;
-        public isOpen: boolean;
         public languageVersion: ScriptTarget;
         public identifiers: Map<string>;
 
@@ -848,7 +846,6 @@ module ts {
         getCompilationSettings(): CompilerOptions;
         getScriptFileNames(): string[];
         getScriptVersion(fileName: string): string;
-        getScriptIsOpen(fileName: string): boolean;
         getScriptSnapshot(fileName: string): IScriptSnapshot;
         getLocalizedDiagnosticMessages?(): any;
         getCancellationToken?(): CancellationToken;
@@ -1163,18 +1160,15 @@ module ts {
             filename: string,
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
-            version: string,
-            isOpen: boolean): SourceFile;
+            version: string): SourceFile;
 
         updateDocument(
             sourceFile: SourceFile,
             filename: string,
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
             version: string,
-            isOpen: boolean,
-            textChangeRange: TextChangeRange
-            ): SourceFile;
+            textChangeRange: TextChangeRange): SourceFile;
 
         releaseDocument(filename: string, compilationSettings: CompilerOptions): void
     }
@@ -1315,7 +1309,6 @@ module ts {
     interface HostFileInformation {
         filename: string;
         version: string;
-        isOpen: boolean;
         sourceText?: IScriptSnapshot;
     }
 
@@ -1409,8 +1402,7 @@ module ts {
                 var filename = filenames[i];
                 this.filenameToEntry[normalizeSlashes(filename)] = {
                     filename: filename,
-                    version: host.getScriptVersion(filename),
-                    isOpen: host.getScriptIsOpen(filename)
+                    version: host.getScriptVersion(filename)
                 };
             }
 
@@ -1453,10 +1445,6 @@ module ts {
             return this.getEntry(filename).version;
         }
 
-        public isOpen(filename: string): boolean {
-            return this.getEntry(filename).isOpen;
-        }
-
         public getScriptSnapshot(filename: string): IScriptSnapshot {
             var file = this.getEntry(filename);
             if (!file.sourceText) {
@@ -1507,7 +1495,7 @@ module ts {
                 var scriptSnapshot = this.hostCache.getScriptSnapshot(filename);
 
                 var start = new Date().getTime();
-                sourceFile = createLanguageServiceSourceFile(filename, scriptSnapshot, ScriptTarget.Latest, version, /*isOpen*/ true, /*setNodeParents;*/ true);
+                sourceFile = createLanguageServiceSourceFile(filename, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents:*/ true);
                 this.log("SyntaxTreeCache.Initialize: createSourceFile: " + (new Date().getTime() - start));
             }
             else if (this.currentFileVersion !== version) {
@@ -1516,7 +1504,7 @@ module ts {
                 var editRange = this.hostCache.getChangeRange(filename, this.currentFileVersion, this.currentSourceFile.scriptSnapshot);
 
                 var start = new Date().getTime();
-                sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, /*isOpen*/ true, editRange);
+                sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange);
                 this.log("SyntaxTreeCache.Initialize: updateSourceFile: " + (new Date().getTime() - start));
             }
 
@@ -1538,21 +1526,20 @@ module ts {
         }
     }
 
-    function setSourceFileFields(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, isOpen: boolean) {
+    function setSourceFileFields(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string) {
         sourceFile.version = version;
-        sourceFile.isOpen = isOpen;
         sourceFile.scriptSnapshot = scriptSnapshot;
     } 
 
-    export function createLanguageServiceSourceFile(filename: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, isOpen: boolean, setNodeParents: boolean): SourceFile {
+    export function createLanguageServiceSourceFile(filename: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile {
         var sourceFile = createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), scriptTarget, setNodeParents);
-        setSourceFileFields(sourceFile, scriptSnapshot, version, isOpen);
+        setSourceFileFields(sourceFile, scriptSnapshot, version);
         return sourceFile;
     }
 
     export var disableIncrementalParsing = false;
 
-    export function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, isOpen: boolean, textChangeRange: TextChangeRange): SourceFile {
+    export function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange): SourceFile {
         if (textChangeRange && Debug.shouldAssert(AssertionLevel.Normal)) {
             var oldText = sourceFile.scriptSnapshot;
             var newText = scriptSnapshot;
@@ -1573,18 +1560,18 @@ module ts {
         // If we were given a text change range, and our version or open-ness changed, then 
         // incrementally parse this file.
         if (textChangeRange) {
-            if (version !== sourceFile.version || isOpen != sourceFile.isOpen) {
+            if (version !== sourceFile.version) {
                 // Once incremental parsing is ready, then just call into this function.
                 if (!disableIncrementalParsing) {
                     var newSourceFile = sourceFile.update(scriptSnapshot.getText(0, scriptSnapshot.getLength()), textChangeRange);
-                    setSourceFileFields(newSourceFile, scriptSnapshot, version, isOpen);
+                    setSourceFileFields(newSourceFile, scriptSnapshot, version);
                     return newSourceFile;
                 }
             }
         }
 
         // Otherwise, just create a new source file.
-        return createLanguageServiceSourceFile(sourceFile.filename, scriptSnapshot, sourceFile.languageVersion, version, isOpen, /*setNodeParents:*/ true);
+        return createLanguageServiceSourceFile(sourceFile.filename, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents:*/ true);
     }
 
     export function createDocumentRegistry(): DocumentRegistry {
@@ -1628,13 +1615,12 @@ module ts {
             filename: string,
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
-            version: string,
-            isOpen: boolean): SourceFile {
+            version: string): SourceFile {
 
             var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
             var entry = lookUp(bucket, filename);
             if (!entry) {
-                var sourceFile = createLanguageServiceSourceFile(filename, scriptSnapshot, compilationSettings.target, version, isOpen, /*setNodeParents:*/ false);
+                var sourceFile = createLanguageServiceSourceFile(filename, scriptSnapshot, compilationSettings.target, version, /*setNodeParents:*/ false);
 
                 bucket[filename] = entry = {
                     sourceFile: sourceFile,
@@ -1653,7 +1639,6 @@ module ts {
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
             version: string,
-            isOpen: boolean,
             textChangeRange: TextChangeRange
             ): SourceFile {
 
@@ -1662,7 +1647,7 @@ module ts {
             var entry = lookUp(bucket, filename);
             Debug.assert(entry !== undefined);
 
-            entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, isOpen, textChangeRange);
+            entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, textChangeRange);
             return entry.sourceFile;
         }
 
@@ -1962,7 +1947,7 @@ module ts {
         }
 
         function sourceFileUpToDate(sourceFile: SourceFile): boolean {
-            return sourceFile && sourceFile.version === hostCache.getVersion(sourceFile.filename) && sourceFile.isOpen === hostCache.isOpen(sourceFile.filename);
+            return sourceFile && sourceFile.version === hostCache.getVersion(sourceFile.filename);
         }
 
         function programUpToDate(): boolean {
@@ -2031,7 +2016,6 @@ module ts {
                 var filename = hostfilenames[i];
 
                 var version = hostCache.getVersion(filename);
-                var isOpen = hostCache.isOpen(filename);
                 var scriptSnapshot = hostCache.getScriptSnapshot(filename);
 
                 var sourceFile: SourceFile = getSourceFile(filename);
@@ -2043,21 +2027,13 @@ module ts {
                         continue;
                     }
 
-                    // Only perform incremental parsing on open files that are being edited.  If a file was
-                    // open, but is now closed, we want to re-parse entirely so we don't have any tokens that
-                    // are holding onto expensive script snapshot instances on the host.  Similarly, if a 
-                    // file was closed, then we always want to re-parse.  This is so our tree doesn't keep 
-                    // the old buffer alive that represented the file on disk (as the host has moved to a 
-                    // new text buffer).
                     var textChangeRange: TextChangeRange = null;
-                    if (sourceFile.isOpen && isOpen) {
-                        textChangeRange = hostCache.getChangeRange(filename, sourceFile.version, sourceFile.scriptSnapshot);
-                    }
+                    textChangeRange = hostCache.getChangeRange(filename, sourceFile.version, sourceFile.scriptSnapshot);
 
-                    sourceFile = documentRegistry.updateDocument(sourceFile, filename, compilationSettings, scriptSnapshot, version, isOpen, textChangeRange);
+                    sourceFile = documentRegistry.updateDocument(sourceFile, filename, compilationSettings, scriptSnapshot, version, textChangeRange);
                 }
                 else {
-                    sourceFile = documentRegistry.acquireDocument(filename, compilationSettings, scriptSnapshot, version, isOpen);
+                    sourceFile = documentRegistry.acquireDocument(filename, compilationSettings, scriptSnapshot, version);
                 }
 
                 // Remember the new sourceFile
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -50,7 +50,6 @@ module ts {
         /** Returns a JSON-encoded value of the type: string[] */
         getScriptFileNames(): string;
         getScriptVersion(fileName: string): string;
-        getScriptIsOpen(fileName: string): boolean;
         getScriptSnapshot(fileName: string): ScriptSnapshotShim;
         getLocalizedDiagnosticMessages(): string;
         getCancellationToken(): CancellationToken;
@@ -251,10 +250,6 @@ module ts {
             return this.shimHost.getScriptVersion(fileName);
         }
 
-        public getScriptIsOpen(fileName: string): boolean {
-            return this.shimHost.getScriptIsOpen(fileName);
-        }
-
         public getLocalizedDiagnosticMessages(): any {
             var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
             if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
diff --git a/tests/cases/unittests/incrementalParser.ts b/tests/cases/unittests/incrementalParser.ts
@@ -20,7 +20,7 @@ module ts {
     }
 
     function createTree(text: IScriptSnapshot, version: string) {
-        return createLanguageServiceSourceFile(/*fileName:*/ "", text, ScriptTarget.Latest, version, /*isOpen:*/ true, /*setNodeParents:*/ true)
+        return createLanguageServiceSourceFile(/*fileName:*/ "", text, ScriptTarget.Latest, version, /*setNodeParents:*/ true)
     }
 
     function assertSameDiagnostics(file1: SourceFile, file2: SourceFile) {
@@ -57,7 +57,7 @@ module ts {
         Utils.assertInvariants(newTree, /*parent:*/ undefined);
 
         // Create a tree for the new text, in an incremental fashion.
-        var incrementalNewTree = updateLanguageServiceSourceFile(oldTree, newText, oldTree.version + ".", /*isOpen:*/ true, textChangeRange);
+        var incrementalNewTree = updateLanguageServiceSourceFile(oldTree, newText, oldTree.version + ".", textChangeRange);
         Utils.assertInvariants(incrementalNewTree, /*parent:*/ undefined);
 
         // We should get the same tree when doign a full or incremental parse.
diff --git a/tests/cases/unittests/services/documentRegistry.ts b/tests/cases/unittests/services/documentRegistry.ts
@@ -5,8 +5,8 @@ describe("DocumentRegistry", () => {
         var documentRegistry = ts.createDocumentRegistry();
         var defaultCompilerOptions = ts.getDefaultCompilerOptions();
 
-        var f1 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1", false);
-        var f2 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1", false);
+        var f1 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1");
+        var f2 = documentRegistry.acquireDocument("file1.ts", defaultCompilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1");
 
         assert(f1 === f2, "DocumentRegistry should return the same document for the same name");
     });
@@ -17,21 +17,21 @@ describe("DocumentRegistry", () => {
 
         // change compilation setting that doesn't affect parsing - should have the same document
         compilerOptions.declaration = true;
-        var f1 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1", false);
+        var f1 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1");
         compilerOptions.declaration = false;
-        var f2 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1", false);
+        var f2 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1");
 
         assert(f1 === f2, "Expected to have the same document instance");
 
 
         // change value of compilation setting that is used during production of AST - new document is required
         compilerOptions.target = ts.ScriptTarget.ES3;
-        var f3 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1", false);
+        var f3 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1");
 
         assert(f1 !== f3, "Changed target: Expected to have different instances of document");
 
         compilerOptions.module = ts.ModuleKind.CommonJS;
-        var f4 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1", false);
+        var f4 = documentRegistry.acquireDocument("file1.ts", compilerOptions, ts.ScriptSnapshot.fromString("var x = 1;"), "1");
 
         assert(f1 !== f4, "Changed module: Expected to have different instances of document");
     });

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ module ts {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`function createTree(text: IScriptSnapshot, version: string) {`
`23`		`- return createLanguageServiceSourceFile(/fileName:/ "", text, ScriptTarget.Latest, version, /isOpen:/ true, /setNodeParents:/ true)`
	`23`	`+ return createLanguageServiceSourceFile(/fileName:/ "", text, ScriptTarget.Latest, version, /setNodeParents:/ true)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`function assertSameDiagnostics(file1: SourceFile, file2: SourceFile) {`
`@@ -57,7 +57,7 @@ module ts {`
`57`	`57`	`Utils.assertInvariants(newTree, /parent:/ undefined);`
`58`	`58`
`59`	`59`	`// Create a tree for the new text, in an incremental fashion.`
`60`		`- var incrementalNewTree = updateLanguageServiceSourceFile(oldTree, newText, oldTree.version + ".", /isOpen:/ true, textChangeRange);`
	`60`	`+ var incrementalNewTree = updateLanguageServiceSourceFile(oldTree, newText, oldTree.version + ".", textChangeRange);`
`61`	`61`	`Utils.assertInvariants(incrementalNewTree, /parent:/ undefined);`
`62`	`62`
`63`	`63`	`// We should get the same tree when doign a full or incremental parse.`