Adding test and comments. Override file content even if already opened.

zhengbli · zhengbli · commit 278b35b35491 · 2015-11-12T11:16:11.000-08:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -385,17 +385,17 @@ namespace FourSlash {
         }
 
         // Opens a file given its 0-based index or fileName
-        public openFile(index: number): void;
-        public openFile(name: string): void;
-        public openFile(indexOrName: any) {
+        public openFile(index: number, content?: string): void;
+        public openFile(name: string, content?: string): void;
+        public openFile(indexOrName: any, content?: string) {
             const fileToOpen: FourSlashFile = this.findFile(indexOrName);
             fileToOpen.fileName = ts.normalizeSlashes(fileToOpen.fileName);
             this.activeFile = fileToOpen;
             const fileName = fileToOpen.fileName.replace(Harness.IO.directoryName(fileToOpen.fileName), "").substr(1);
             this.scenarioActions.push(`<OpenFile FileName="" SrcFileId="${fileName}" FileId="${fileName}" />`);
 
             // Let the host know that this file is now open
-            this.languageServiceAdapterHost.openFile(fileToOpen.fileName);
+            this.languageServiceAdapterHost.openFile(fileToOpen.fileName, content);
         }
 
         public verifyErrorExistsBetweenMarkers(startMarkerName: string, endMarkerName: string, negative: boolean) {
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -153,7 +153,7 @@ namespace Harness.LanguageService {
             throw new Error("No script with name '" + fileName + "'");
         }
 
-        public openFile(fileName: string): void {
+        public openFile(fileName: string, content?: string): void {
         }
 
         /**
@@ -493,9 +493,9 @@ namespace Harness.LanguageService {
             this.client = client;
         }
 
-        openFile(fileName: string): void {
-            super.openFile(fileName);
-            this.client.openFile(fileName);
+        openFile(fileName: string, content?: string): void {
+            super.openFile(fileName, content);
+            this.client.openFile(fileName, content);
         }
 
         editScript(fileName: string, start: number, end: number, newText: string) {
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -120,8 +120,8 @@ namespace ts.server {
             return response;
         }
 
-        openFile(fileName: string): void {
-            var args: protocol.FileRequestArgs = { file: fileName };
+        openFile(fileName: string, content?: string): void {
+            var args: protocol.OpenRequestArgs = { file: fileName, fileContent: content };
             this.processRequest(CommandNames.Open, args);
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1031,6 +1031,9 @@ namespace ts.server {
                 }
             }
             if (info) {
+                if (fileContent) {
+                    info.svc.reload(fileContent);
+                }
                 if (openedByClient) {
                     info.isOpen = true;
                 }
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
@@ -513,6 +513,10 @@ declare namespace ts.server.protocol {
       *  Information found in an "open" request.
       */
     export interface OpenRequestArgs extends FileRequestArgs {
+        /**
+         * Used when a version of the file content is known to be more up to date than the one on disk. 
+         * Then the known content will be used upon opening instead of the disk copy   
+         */ 
         fileContent?: string;
     }
 
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -169,10 +169,10 @@ module FourSlashInterface {
         // Opens a file, given either its index as it
         // appears in the test source, or its filename
         // as specified in the test metadata
-        public file(index: number);
-        public file(name: string);
-        public file(indexOrName: any) {
-            FourSlash.currentTestState.openFile(indexOrName);
+        public file(index: number, content?: string);
+        public file(name: string, content?: string);
+        public file(indexOrName: any, content?: string) {
+            FourSlash.currentTestState.openFile(indexOrName, content);
         }
     }
 
diff --git a/tests/cases/fourslash/server/openFile.ts b/tests/cases/fourslash/server/openFile.ts
@@ -0,0 +1,17 @@
+/// <reference path="../fourslash.ts"/>
+
+// @Filename: test1.ts
+////t.
+
+// @Filename: test.ts
+////var t = '10';
+
+// @Filename: tsconfig.json
+////{ "files": ["test.ts", "test1.ts"] }
+
+var overridingContent = "var t = 10; t.";
+debugger;
+goTo.file("test.ts", overridingContent);
+goTo.file("test1.ts");
+goTo.eof();
+verify.completionListContains("toExponential");

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ namespace Harness.LanguageService {`
`153`	`153`	`throw new Error("No script with name '" + fileName + "'");`
`154`	`154`	`}`
`155`	`155`
`156`		`- public openFile(fileName: string): void {`
	`156`	`+ public openFile(fileName: string, content?: string): void {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`/**`
`@@ -493,9 +493,9 @@ namespace Harness.LanguageService {`
`493`	`493`	`this.client = client;`
`494`	`494`	`}`
`495`	`495`
`496`		`- openFile(fileName: string): void {`
`497`		`- super.openFile(fileName);`
`498`		`- this.client.openFile(fileName);`
	`496`	`+ openFile(fileName: string, content?: string): void {`
	`497`	`+ super.openFile(fileName, content);`
	`498`	`+ this.client.openFile(fileName, content);`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`editScript(fileName: string, start: number, end: number, newText: string) {`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ namespace ts.server {`
`120`	`120`	`return response;`
`121`	`121`	`}`
`122`	`122`
`123`		`- openFile(fileName: string): void {`
`124`		`- var args: protocol.FileRequestArgs = { file: fileName };`
	`123`	`+ openFile(fileName: string, content?: string): void {`
	`124`	`+ var args: protocol.OpenRequestArgs = { file: fileName, fileContent: content };`
`125`	`125`	`this.processRequest(CommandNames.Open, args);`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -1031,6 +1031,9 @@ namespace ts.server {`
`1031`	`1031`	`}`
`1032`	`1032`	`}`
`1033`	`1033`	`if (info) {`
	`1034`	`+ if (fileContent) {`
	`1035`	`+ info.svc.reload(fileContent);`
	`1036`	`+ }`
`1034`	`1037`	`if (openedByClient) {`
`1035`	`1038`	`info.isOpen = true;`
`1036`	`1039`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,10 +169,10 @@ module FourSlashInterface {`
`169`	`169`	`// Opens a file, given either its index as it`
`170`	`170`	`// appears in the test source, or its filename`
`171`	`171`	`// as specified in the test metadata`
`172`		`- public file(index: number);`
`173`		`- public file(name: string);`
`174`		`- public file(indexOrName: any) {`
`175`		`- FourSlash.currentTestState.openFile(indexOrName);`
	`172`	`+ public file(index: number, content?: string);`
	`173`	`+ public file(name: string, content?: string);`
	`174`	`+ public file(indexOrName: any, content?: string) {`
	`175`	`+ FourSlash.currentTestState.openFile(indexOrName, content);`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`