apply new language to all 3wm models (microsoft#153278)

jrieken · web-flow · commit a60ffd7029f7 · 2022-06-27T11:47:36.000+02:00
refines microsoft#151136 (comment)
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -337,7 +337,11 @@ export class MergeEditorModel extends EditorModel {
 	}
 
 	public setLanguageId(languageId: string): void {
-		this.modelService.setMode(this.result, this.languageService.createById(languageId));
+		const language = this.languageService.createById(languageId);
+		this.modelService.setMode(this.base, language);
+		this.modelService.setMode(this.input1, language);
+		this.modelService.setMode(this.input2, language);
+		this.modelService.setMode(this.result, language);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,11 @@ export class MergeEditorModel extends EditorModel {`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`public setLanguageId(languageId: string): void {`
`340`		`- this.modelService.setMode(this.result, this.languageService.createById(languageId));`
	`340`	`+ const language = this.languageService.createById(languageId);`
	`341`	`+ this.modelService.setMode(this.base, language);`
	`342`	`+ this.modelService.setMode(this.input1, language);`
	`343`	`+ this.modelService.setMode(this.input2, language);`
	`344`	`+ this.modelService.setMode(this.result, language);`
`341`	`345`	`}`
`342`	`346`	`}`
`343`	`347`