untitled - do not update model with initial value if existing

Benjamin Pasero · Benjamin Pasero · commit 44b029124f24 · 2020-02-11T14:51:05.000+01:00
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -141,13 +141,15 @@ export class BaseTextEditorModel extends EditorModel implements ITextEditorModel
 	/**
 	 * Updates the text editor model with the provided value. If the value is the same as the model has, this is a no-op.
 	 */
-	protected updateTextEditorModel(newValue: ITextBufferFactory, preferredMode?: string): void {
+	protected updateTextEditorModel(newValue?: ITextBufferFactory, preferredMode?: string): void {
 		if (!this.isResolved()) {
 			return;
 		}
 
 		// contents
-		this.modelService.updateModel(this.textEditorModel, newValue);
+		if (newValue) {
+			this.modelService.updateModel(this.textEditorModel, newValue);
+		}
 
 		// mode (only if specific and changed)
 		if (preferredMode && preferredMode !== PLAINTEXT_MODE_ID && this.textEditorModel.getModeId() !== preferredMode) {
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
@@ -56,8 +56,9 @@ export interface IUntitledTextEditorModel extends ITextEditorModel, IModeSupport
 
 	/**
 	 * Updates the value of the untitled model optionally allowing to ignore dirty.
+	 * The model must be resolved for this method to work.
 	 */
-	setValue(value: string, ignoreDirty?: boolean): void;
+	setValue(this: IResolvedTextEditorModel, value: string, ignoreDirty?: boolean): void;
 }
 
 export class UntitledTextEditorModel extends BaseTextEditorModel implements IUntitledTextEditorModel {
@@ -259,9 +260,11 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt
 			this.createTextEditorModel(untitledContents, this.resource, this.preferredMode);
 		}
 
-		// Otherwise update
+		// Otherwise: the untitled model already exists and we must assume
+		// that the value of the model was changed by the user. As such we
+		// do not update the contents, only the mode if configured.
 		else {
-			this.updateTextEditorModel(untitledContents, this.preferredMode);
+			this.updateTextEditorModel(undefined, this.preferredMode);
 		}
 
 		// Figure out encoding now that model is present
