Adds setting showEmptyDecorations (microsoft#186138)

Co-authored-by: João Moreno <[email protected]>

Author: hediet

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

@@ -37,6 +37,7 @@ export class DiffEditorDecorations extends Disposable {
 
 		const currentMove = this._diffModel.read(reader)!.syncedMovedTexts.read(reader);
 		const renderIndicators = this._options.renderIndicators.read(reader);
+		const showEmptyDecorations = this._options.showEmptyDecorations.read(reader);
 
 		const originalDecorations: IModelDeltaDecoration[] = [];
 		const modifiedDecorations: IModelDeltaDecoration[] = [];
@@ -60,8 +61,8 @@ export class DiffEditorDecorations extends Disposable {
 					continue;
 				}
 
-				originalDecorations.push({ range: i.originalRange, options: i.originalRange.isEmpty() ? diffDeleteDecorationEmpty : diffDeleteDecoration });
-				modifiedDecorations.push({ range: i.modifiedRange, options: i.modifiedRange.isEmpty() ? diffAddDecorationEmpty : diffAddDecoration });
+				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 (!m.lineRangeMapping.modifiedRange.isEmpty && this._options.shouldRenderRevertArrows.read(reader) && !currentMove) {

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

@@ -53,6 +53,7 @@ export class DiffEditorOptions {
 	public readonly diffCodeLens = derived('diffCodeLens', reader => this._options.read(reader).diffCodeLens);
 	public readonly accessibilityVerbose = derived('accessibilityVerbose', reader => this._options.read(reader).accessibilityVerbose);
 	public readonly diffAlgorithm = derived('diffAlgorithm', reader => this._options.read(reader).diffAlgorithm);
+	public readonly showEmptyDecorations = derived('showEmptyDecorations', reader => this._options.read(reader).experimental.showEmptyDecorations!);
 
 	public updateOptions(changedOptions: IDiffEditorOptions): void {
 		const newDiffEditorOptions = validateDiffEditorOptions(changedOptions, this._options.get());
@@ -79,6 +80,7 @@ const diffEditorDefaultOptions: ValidDiffEditorBaseOptions = {
 	experimental: {
 		collapseUnchangedRegions: false,
 		showMoves: false,
+		showEmptyDecorations: true,
 	},
 	isInEmbeddedEditor: false,
 };
@@ -102,6 +104,7 @@ function validateDiffEditorOptions(options: Readonly<IDiffEditorOptions>, defaul
 		experimental: {
 			collapseUnchangedRegions: validateBooleanOption(options.experimental?.collapseUnchangedRegions, defaults.experimental.collapseUnchangedRegions!),
 			showMoves: validateBooleanOption(options.experimental?.showMoves, defaults.experimental.showMoves!),
+			showEmptyDecorations: validateBooleanOption(options.experimental?.showEmptyDecorations, defaults.experimental.showEmptyDecorations!),
 		},
 		isInEmbeddedEditor: validateBooleanOption(options.isInEmbeddedEditor, defaults.isInEmbeddedEditor),
 	};

src/vs/editor/common/config/editorConfigurationSchema.ts

@@ -216,6 +216,11 @@ const editorConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: true,
 			description: nls.localize('useVersion2', "Controls whether the diff editor uses the new or the old implementation."),
+		},
+		'diffEditor.experimental.showEmptyDecorations': {
+			type: 'boolean',
+			default: true,
+			description: nls.localize('showEmptyDecorations', "Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted."),
 		}
 	}
 };