Add file content as a parameter for the tsserver open command

zhengbli · zhengbli · commit f92d24188826 · 2015-11-10T13:36:19.000-08:00
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1006,14 +1006,15 @@ namespace ts.server {
 
         /**
          * @param filename is absolute pathname
+         * @param fileContent is a known version of the file content that is more up to date
          */
-        openFile(fileName: string, openedByClient: boolean) {
+        openFile(fileName: string, openedByClient: boolean, fileContent?: string) {
             fileName = ts.normalizePath(fileName);
             let info = ts.lookUp(this.filenameToScriptInfo, fileName);
             if (!info) {
                 let content: string;
                 if (this.host.fileExists(fileName)) {
-                    content = this.host.readFile(fileName);
+                    content = fileContent ? fileContent : this.host.readFile(fileName);
                 }
                 if (!content) {
                     if (openedByClient) {
@@ -1060,10 +1061,11 @@ namespace ts.server {
         /**
          * Open file whose contents is managed by the client
          * @param filename is absolute pathname
+         * @param fileContent is a known version of the file content that is more up to date 
          */
-        openClientFile(fileName: string) {
+        openClientFile(fileName: string, fileContent?: string) {
             this.openOrUpdateConfiguredProjectForFile(fileName);
-            const info = this.openFile(fileName, true);
+            const info = this.openFile(fileName, true, fileContent);
             this.addOpenFile(info);
             this.printProjects();
             return info;
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
@@ -513,6 +513,7 @@ declare namespace ts.server.protocol {
       *  Information found in an "open" request.
       */
     export interface OpenRequestArgs extends FileRequestArgs {
+        fileContent?: string;
     }
 
     /**
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -532,9 +532,13 @@ namespace ts.server {
             };
         }
 
-        private openClientFile(fileName: string) {
+        /**
+         * @param fileName is the name of the file to be opened
+         * @param fileContent is a version of the file content that is known to be more up to date
+         */
+        private openClientFile(fileName: string, fileContent?: string) {
             const file = ts.normalizePath(fileName);
-            this.projectService.openClientFile(file);
+            this.projectService.openClientFile(file, fileContent);
         }
 
         private getQuickInfo(line: number, offset: number, fileName: string): protocol.QuickInfoResponseBody {
@@ -968,7 +972,7 @@ namespace ts.server {
             },
             [CommandNames.Open]: (request: protocol.Request) => {
                 const openArgs = <protocol.OpenRequestArgs>request.arguments;
-                this.openClientFile(openArgs.file);
+                this.openClientFile(openArgs.file, openArgs.fileContent);
                 return {responseRequired: false};
             },
             [CommandNames.Quickinfo]: (request: protocol.Request) => {

Original file line number	Diff line number	Diff line change
`@@ -513,6 +513,7 @@ declare namespace ts.server.protocol {`
`513`	`513`	`* Information found in an "open" request.`
`514`	`514`	`*/`
`515`	`515`	`export interface OpenRequestArgs extends FileRequestArgs {`
	`516`	`+ fileContent?: string;`
`516`	`517`	`}`
`517`	`518`
`518`	`519`	`/**`