Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds setting showEmptyDecorations #186138

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Adds setting showEmptyDecorations #186138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0239a1
Adds setting showEmptyDecorations
hediet Jun 26, 2023
c0fa2d7
Merge branch 'main' into inc-bovid
joaomoreno Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/vs/editor/browser/widget/diffEditorWidget2/diffEditorDecorations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [];
Expand All @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions src/vs/editor/browser/widget/diffEditorWidget2/diffEditorOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -79,6 +80,7 @@ const diffEditorDefaultOptions: ValidDiffEditorBaseOptions = {
experimental: {
collapseUnchangedRegions: false,
showMoves: false,
showEmptyDecorations: true,
},
isInEmbeddedEditor: false,
};
Expand All @@ -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),
};
Expand Down
5 changes: 5 additions & 0 deletions src/vs/editor/common/config/editorConfigurationSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."),
}
}
};
Expand Down