Fixes microsoft#153495.

hediet · hediet · commit 4595b6cc7c11 · 2022-06-29T14:25:27.000+02:00
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
@@ -92,7 +92,7 @@ export class MergeEditorViewModel {
 			const range = this.getRange(lastFocusedEditor, modifiedBaseRange, undefined);
 			lastFocusedEditor.editor.setPosition({
 				lineNumber: range.startLineNumber,
-				column: 1,
+				column: lastFocusedEditor.editor.getModel()!.getLineFirstNonWhitespaceColumn(range.startLineNumber),
 			});
 			lastFocusedEditor.editor.revealLinesNearTop(range.startLineNumber, range.endLineNumberExclusive, ScrollType.Smooth);
 		}

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ export class MergeEditorViewModel {`
`92`	`92`	`const range = this.getRange(lastFocusedEditor, modifiedBaseRange, undefined);`
`93`	`93`	`lastFocusedEditor.editor.setPosition({`
`94`	`94`	`lineNumber: range.startLineNumber,`
`95`		`- column: 1,`
	`95`	`+ column: lastFocusedEditor.editor.getModel()!.getLineFirstNonWhitespaceColumn(range.startLineNumber),`
`96`	`96`	`});`
`97`	`97`	`lastFocusedEditor.editor.revealLinesNearTop(range.startLineNumber, range.endLineNumberExclusive, ScrollType.Smooth);`
`98`	`98`	`}`