Improves diff decorations (microsoft#186161)

hediet · web-flow · commit 2e9aae6c2690 · 2023-06-26T16:10:04.000+02:00
diff --git a/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts b/src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
@@ -61,8 +61,12 @@ export class DiffEditorDecorations extends Disposable {
 					continue;
 				}
 
-				originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
-				modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
+				if (i.originalRange.startLineNumber < m.lineRangeMapping.originalRange.endLineNumberExclusive) {
+					originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
+				}
+				if (i.modifiedRange.startLineNumber < m.lineRangeMapping.modifiedRange.endLineNumberExclusive) {
+					modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
+				}
 			}
 
 			if (!m.lineRangeMapping.modifiedRange.isEmpty && this._options.shouldRenderRevertArrows.read(reader) && !currentMove) {

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,12 @@ export class DiffEditorDecorations extends Disposable {`
`61`	`61`	`continue;`
`62`	`62`	`}`
`63`	`63`
`64`		`- originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });`
`65`		`- modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });`
	`64`	`+ if (i.originalRange.startLineNumber < m.lineRangeMapping.originalRange.endLineNumberExclusive) {`
	`65`	`+ originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });`
	`66`	`+ }`
	`67`	`+ if (i.modifiedRange.startLineNumber < m.lineRangeMapping.modifiedRange.endLineNumberExclusive) {`
	`68`	`+ modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });`
	`69`	`+ }`
`66`	`70`	`}`
`67`	`71`
`68`	`72`	`if (!m.lineRangeMapping.modifiedRange.isEmpty && this._options.shouldRenderRevertArrows.read(reader) && !currentMove) {`