Skip to content

Commit 698b8ad

Browse files
authored
1 parent b210745 commit 698b8ad

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,10 +559,13 @@ function computeRangeAlignment(
559559
if (innerHunkAlignment) {
560560
for (const i of c.innerChanges || []) {
561561
if (i.originalRange.startColumn > 1 && i.modifiedRange.startColumn > 1) {
562-
// There is some unmodified text on this line
562+
// There is some unmodified text on this line before the diff
563563
emitAlignment(i.originalRange.startLineNumber, i.modifiedRange.startLineNumber);
564564
}
565-
emitAlignment(i.originalRange.endLineNumber, i.modifiedRange.endLineNumber);
565+
if (i.originalRange.endColumn < originalEditor.getModel()!.getLineMaxColumn(i.originalRange.endLineNumber)) {
566+
// // There is some unmodified text on this line after the diff
567+
emitAlignment(i.originalRange.endLineNumber, i.modifiedRange.endLineNumber);
568+
}
566569
}
567570
}
568571

0 commit comments

Comments
 (0)