Fixes diff editor alignment bug (microsoft#185745)

hediet · web-flow · commit e0338cd7e9c7 · 2023-06-21T14:17:30.000+02:00
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts b/src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts
@@ -551,7 +551,7 @@ function getAdditionalLineHeights(editor: CodeEditorWidget, viewZonesToIgnore: R
 		if (viewZonesToIgnore.has(w.id)) {
 			continue;
 		}
-		const modelLineNumber = coordinatesConverter.convertViewPositionToModelPosition(
+		const modelLineNumber = w.afterLineNumber === 0 ? 0 : coordinatesConverter.convertViewPositionToModelPosition(
 			new Position(w.afterLineNumber, 1)
 		).lineNumber;
 		viewZoneHeights.push({ lineNumber: modelLineNumber, heightInPx: w.height });

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ function getAdditionalLineHeights(editor: CodeEditorWidget, viewZonesToIgnore: R`
`551`	`551`	`if (viewZonesToIgnore.has(w.id)) {`
`552`	`552`	`continue;`
`553`	`553`	`}`
`554`		`- const modelLineNumber = coordinatesConverter.convertViewPositionToModelPosition(`
	`554`	`+ const modelLineNumber = w.afterLineNumber === 0 ? 0 : coordinatesConverter.convertViewPositionToModelPosition(`
`555`	`555`	`new Position(w.afterLineNumber, 1)`
`556`	`556`	`).lineNumber;`
`557`	`557`	`viewZoneHeights.push({ lineNumber: modelLineNumber, heightInPx: w.height });`