Merge pull request microsoft#163265 from microsoft/hediet/merge-editor-eol-bug-162999

hediet · web-flow · commit 395ce44c8d12 · 2022-10-12T11:07:52.000+02:00
Fixes Merge editor saves files using the wrong newlines
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
@@ -181,7 +181,7 @@ export class MergeEditorModel extends EditorModel {
 
 		appendLinesToResult(baseLines, LineRange.fromLineNumbers(baseStartLineNumber, baseLines.length + 1));
 
-		return resultLines.join('\n');
+		return resultLines.join(this.resultTextModel.getEOL());
 	}
 
 	public hasBaseRange(baseRange: ModifiedBaseRange): boolean {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ export class MergeEditorModel extends EditorModel {`
`181`	`181`
`182`	`182`	`appendLinesToResult(baseLines, LineRange.fromLineNumbers(baseStartLineNumber, baseLines.length + 1));`
`183`	`183`
`184`		`- return resultLines.join('\n');`
	`184`	`+ return resultLines.join(this.resultTextModel.getEOL());`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`public hasBaseRange(baseRange: ModifiedBaseRange): boolean {`