Fix conversion of TextChanges to FileCodeEdits for new file (microsoft#24126)

Andy · web-flow · commit cbbe34b35e54 · 2018-05-15T13:55:26.000-07:00
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -964,7 +964,7 @@ namespace ts.server {
             return this.missingFilesMap && this.missingFilesMap.has(path);
         }
 
-        getScriptInfoForNormalizedPath(fileName: NormalizedPath) {
+        getScriptInfoForNormalizedPath(fileName: NormalizedPath): ScriptInfo | undefined {
             const scriptInfo = this.projectService.getScriptInfoForPath(this.toPath(fileName));
             if (scriptInfo && !scriptInfo.isAttached(this)) {
                 return Errors.ThrowProjectDoesNotContainDocument(fileName, this);
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1766,11 +1766,17 @@ namespace ts.server {
             return textChanges.map(change => this.mapTextChangesToCodeEditsUsingScriptinfo(change, project.getScriptInfoForNormalizedPath(toNormalizedPath(change.fileName))));
         }
 
-        private mapTextChangesToCodeEditsUsingScriptinfo(textChanges: FileTextChanges, scriptInfo: ScriptInfo): protocol.FileCodeEdits {
-            return {
-                fileName: textChanges.fileName,
-                textChanges: textChanges.textChanges.map(textChange => this.convertTextChangeToCodeEdit(textChange, scriptInfo))
-            };
+        private mapTextChangesToCodeEditsUsingScriptinfo(textChanges: FileTextChanges, scriptInfo: ScriptInfo | undefined): protocol.FileCodeEdits {
+            Debug.assert(!!textChanges.isNewFile === !scriptInfo);
+            if (scriptInfo) {
+                return {
+                    fileName: textChanges.fileName,
+                    textChanges: textChanges.textChanges.map(textChange => this.convertTextChangeToCodeEdit(textChange, scriptInfo))
+                };
+            }
+            else {
+                return this.convertNewFileTextChangeToCodeEdit(textChanges);
+            }
         }
 
         private convertTextChangeToCodeEdit(change: TextChange, scriptInfo: ScriptInfo): protocol.CodeEdit {
@@ -1781,6 +1787,13 @@ namespace ts.server {
             };
         }
 
+        private convertNewFileTextChangeToCodeEdit(textChanges: FileTextChanges): protocol.FileCodeEdits {
+            Debug.assert(textChanges.textChanges.length === 1);
+            const change = first(textChanges.textChanges);
+            Debug.assert(change.span.start === 0 && change.span.length === 0);
+            return { fileName: textChanges.fileName, textChanges: [{ start: { line: 0, offset: 0 }, end: { line: 0, offset: 0 }, newText: change.newText }] };
+        }
+
         private getBraceMatching(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.TextSpan[] | TextSpan[] {
             const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args);
             const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -719,7 +719,7 @@ namespace ts.textChanges {
 
         export function newFileChanges(oldFile: SourceFile, fileName: string, statements: ReadonlyArray<Statement>, newLineCharacter: string): FileTextChanges {
             const text = statements.map(s => getNonformattedText(s, oldFile, newLineCharacter).text).join(newLineCharacter);
-            return { fileName, textChanges: [createTextChange(createTextSpan(0, 0), text)] };
+            return { fileName, textChanges: [createTextChange(createTextSpan(0, 0), text)], isNewFile: true };
         }
 
         function computeNewText(change: Change, sourceFile: SourceFile, newLineCharacter: string, formatContext: formatting.FormatContext, validate: ValidateNonFormattedText): string {
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -439,6 +439,7 @@ namespace ts {
     export interface FileTextChanges {
         fileName: string;
         textChanges: TextChange[];
+        isNewFile?: boolean;
     }
 
     export interface CodeAction {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -4618,6 +4618,7 @@ declare namespace ts {
     interface FileTextChanges {
         fileName: string;
         textChanges: TextChange[];
+        isNewFile?: boolean;
     }
     interface CodeAction {
         /** Description of the code action to display in the UI of the editor */
@@ -7898,7 +7899,7 @@ declare namespace ts.server {
         private detachScriptInfoFromProject;
         private addMissingFileWatcher;
         private isWatchedMissingFile;
-        getScriptInfoForNormalizedPath(fileName: NormalizedPath): ScriptInfo;
+        getScriptInfoForNormalizedPath(fileName: NormalizedPath): ScriptInfo | undefined;
         getScriptInfo(uncheckedFileName: string): ScriptInfo;
         filesToString(writeProjectFileNames: boolean): string;
         setCompilerOptions(compilerOptions: CompilerOptions): void;
@@ -8492,6 +8493,7 @@ declare namespace ts.server {
         private mapTextChangesToCodeEdits;
         private mapTextChangesToCodeEditsUsingScriptinfo;
         private convertTextChangeToCodeEdit;
+        private convertNewFileTextChangeToCodeEdit;
         private getBraceMatching;
         private getDiagnosticsForProject;
         getCanonicalFileName(fileName: string): string;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -4618,6 +4618,7 @@ declare namespace ts {
     interface FileTextChanges {
         fileName: string;
         textChanges: TextChange[];
+        isNewFile?: boolean;
     }
     interface CodeAction {
         /** Description of the code action to display in the UI of the editor */

Original file line number	Diff line number	Diff line change
`@@ -964,7 +964,7 @@ namespace ts.server {`
`964`	`964`	`return this.missingFilesMap && this.missingFilesMap.has(path);`
`965`	`965`	`}`
`966`	`966`
`967`		`- getScriptInfoForNormalizedPath(fileName: NormalizedPath) {`
	`967`	`+ getScriptInfoForNormalizedPath(fileName: NormalizedPath): ScriptInfo \| undefined {`
`968`	`968`	`const scriptInfo = this.projectService.getScriptInfoForPath(this.toPath(fileName));`
`969`	`969`	`if (scriptInfo && !scriptInfo.isAttached(this)) {`
`970`	`970`	`return Errors.ThrowProjectDoesNotContainDocument(fileName, this);`
Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ namespace ts.textChanges {`
`719`	`719`
`720`	`720`	`export function newFileChanges(oldFile: SourceFile, fileName: string, statements: ReadonlyArray<Statement>, newLineCharacter: string): FileTextChanges {`
`721`	`721`	`const text = statements.map(s => getNonformattedText(s, oldFile, newLineCharacter).text).join(newLineCharacter);`
`722`		`- return { fileName, textChanges: [createTextChange(createTextSpan(0, 0), text)] };`
	`722`	`+ return { fileName, textChanges: [createTextChange(createTextSpan(0, 0), text)], isNewFile: true };`
`723`	`723`	`}`
`724`	`724`
`725`	`725`	`function computeNewText(change: Change, sourceFile: SourceFile, newLineCharacter: string, formatContext: formatting.FormatContext, validate: ValidateNonFormattedText): string {`
Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,7 @@ namespace ts {`
`439`	`439`	`export interface FileTextChanges {`
`440`	`440`	`fileName: string;`
`441`	`441`	`textChanges: TextChange[];`
	`442`	`+ isNewFile?: boolean;`
`442`	`443`	`}`
`443`	`444`
`444`	`445`	`export interface CodeAction {`
Original file line number	Diff line number	Diff line change
`@@ -4618,6 +4618,7 @@ declare namespace ts {`
`4618`	`4618`	`interface FileTextChanges {`
`4619`	`4619`	`fileName: string;`
`4620`	`4620`	`textChanges: TextChange[];`
	`4621`	`+ isNewFile?: boolean;`
`4621`	`4622`	`}`
`4622`	`4623`	`interface CodeAction {`
`4623`	`4624`	`/** Description of the code action to display in the UI of the editor */`