fix broken language mode after saving untitled (fix microsoft#86971)

Benjamin Pasero · Benjamin Pasero · commit 73fcde8bc855 · 2019-12-16T18:18:23.000+01:00
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -433,7 +433,12 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 				modelToRestoreResource = joinPath(target, sourceModelResource.path.substr(source.path.length + 1));
 			}
 
-			const modelToRestore: ModelToRestore = { resource: modelToRestoreResource, encoding: sourceModel.getEncoding(), mode: sourceModel.textEditorModel?.getModeId() };
+			let mode: string | undefined = sourceModel.textEditorModel?.getModeId();
+			if (mode === PLAINTEXT_MODE_ID) {
+				mode = undefined; // never enforce plain text mode when moving as it is unspecific
+			}
+
+			const modelToRestore: ModelToRestore = { resource: modelToRestoreResource, encoding: sourceModel.getEncoding(), mode };
 			if (sourceModel.isDirty()) {
 				modelToRestore.snapshot = sourceModel.createSnapshot();
 			}
@@ -766,7 +771,12 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 				await this.create(target, '');
 			}
 
-			targetModel = await this.models.loadOrCreate(target, { encoding: sourceModel.getEncoding(), mode: sourceModel.textEditorModel?.getModeId() });
+			let mode: string | undefined = sourceModel.textEditorModel?.getModeId();
+			if (mode === PLAINTEXT_MODE_ID) {
+				mode = undefined; // never enforce plain text mode when moving as it is unspecific
+			}
+
+			targetModel = await this.models.loadOrCreate(target, { encoding: sourceModel.getEncoding(), mode });
 		}
 
 		try {

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,12 @@ export abstract class AbstractTextFileService extends Disposable implements ITex`
`433`	`433`	`modelToRestoreResource = joinPath(target, sourceModelResource.path.substr(source.path.length + 1));`
`434`	`434`	`}`
`435`	`435`
`436`		`- const modelToRestore: ModelToRestore = { resource: modelToRestoreResource, encoding: sourceModel.getEncoding(), mode: sourceModel.textEditorModel?.getModeId() };`
	`436`	`+ let mode: string \| undefined = sourceModel.textEditorModel?.getModeId();`
	`437`	`+ if (mode === PLAINTEXT_MODE_ID) {`
	`438`	`+ mode = undefined; // never enforce plain text mode when moving as it is unspecific`
	`439`	`+ }`
	`440`	`+`
	`441`	`+ const modelToRestore: ModelToRestore = { resource: modelToRestoreResource, encoding: sourceModel.getEncoding(), mode };`
`437`	`442`	`if (sourceModel.isDirty()) {`
`438`	`443`	`modelToRestore.snapshot = sourceModel.createSnapshot();`
`439`	`444`	`}`
`@@ -766,7 +771,12 @@ export abstract class AbstractTextFileService extends Disposable implements ITex`
`766`	`771`	`await this.create(target, '');`
`767`	`772`	`}`
`768`	`773`
`769`		`- targetModel = await this.models.loadOrCreate(target, { encoding: sourceModel.getEncoding(), mode: sourceModel.textEditorModel?.getModeId() });`
	`774`	`+ let mode: string \| undefined = sourceModel.textEditorModel?.getModeId();`
	`775`	`+ if (mode === PLAINTEXT_MODE_ID) {`
	`776`	`+ mode = undefined; // never enforce plain text mode when moving as it is unspecific`
	`777`	`+ }`
	`778`	`+`
	`779`	`+ targetModel = await this.models.loadOrCreate(target, { encoding: sourceModel.getEncoding(), mode });`
`770`	`780`	`}`
`771`	`781`
`772`	`782`	`try {`