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

Add render side by side setting #239188

Merged
merged 2 commits into from
Jan 30, 2025
+20 −1
Merged

Add render side by side setting #239188

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
cd934d5
Add render side by side setting
benibenj Jan 30, 2025
b313058
Merge remote-tracking branch 'origin/main' into benibenj/decisive-ban…
benibenj Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/vs/editor/common/config/editorOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4213,6 +4213,8 @@ export interface IInlineSuggestOptions {
edits?: {
codeShifting?: boolean;

renderSideBySide?: 'never' | 'auto';

/**
* @internal
*/
Expand Down Expand Up @@ -4262,6 +4264,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
enabled: true,
useMixedLinesDiff: 'forStableInsertions',
useInterleavedLinesDiff: 'never',
renderSideBySide: 'auto',
useGutterIndicator: true,
codeShifting: true,
useMultiLineGhostText: true
Expand Down Expand Up @@ -4313,6 +4316,16 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
default: defaults.edits.codeShifting,
description: nls.localize('inlineSuggest.edits.codeShifting', "Controls whether showing a suggestion will shift the code to make space for the suggestion inline."),
},
'editor.inlineSuggest.edits.renderSideBySide': {
type: 'string',
default: defaults.edits.renderSideBySide,
description: nls.localize('inlineSuggest.edits.renderSideBySide', "Controls whether larger suggestions can be shown side by side."),
enum: ['auto', 'never'],
enumDescriptions: [
nls.localize('editor.inlineSuggest.edits.renderSideBySide.auto', "Larger suggestions will show side by side if there is enough space, otherwise they will be shown bellow."),
nls.localize('editor.inlineSuggest.edits.renderSideBySide.never', "Larger suggestions are never shown side by side and will always be shown bellow."),
],
},
/* 'editor.inlineSuggest.edits.useMultiLineGhostText': {
type: 'boolean',
default: defaults.edits.useMultiLineGhostText,
Expand Down Expand Up @@ -4350,6 +4363,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
enabled: boolean(input.edits?.enabled, this.defaultValue.edits.enabled),
useMixedLinesDiff: stringSet(input.edits?.useMixedLinesDiff, this.defaultValue.edits.useMixedLinesDiff, ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible']),
codeShifting: boolean(input.edits?.codeShifting, this.defaultValue.edits.codeShifting),
renderSideBySide: stringSet(input.edits?.renderSideBySide, this.defaultValue.edits.renderSideBySide, ['never', 'auto']),
useInterleavedLinesDiff: stringSet(input.edits?.useInterleavedLinesDiff, this.defaultValue.edits.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
useGutterIndicator: boolean(input.edits?.useGutterIndicator, this.defaultValue.edits.useGutterIndicator),
useMultiLineGhostText: boolean(input.edits?.useMultiLineGhostText, this.defaultValue.edits.useMultiLineGhostText),
Expand Down
7 changes: 6 additions & 1 deletion src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class InlineEditsView extends Disposable {
private readonly _useMixedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.useMixedLinesDiff);
private readonly _useInterleavedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.useInterleavedLinesDiff);
private readonly _useCodeShifting = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.codeShifting);
private readonly _renderSideBySide = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.renderSideBySide);
private readonly _useMultiLineGhostText = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText);

private _previousView: {
Expand Down Expand Up @@ -282,7 +283,11 @@ export class InlineEditsView extends Disposable {
}
}

if (numOriginalLines > 0 && numModifiedLines > 0 && !InlineEditsSideBySideDiff.fitsInsideViewport(this._editor, edit, reader)) {
if (numOriginalLines > 0 && numModifiedLines > 0) {
if (this._renderSideBySide.read(reader) !== 'never' && InlineEditsSideBySideDiff.fitsInsideViewport(this._editor, edit, reader)) {
return 'sideBySide';
}

return 'lineReplacement';
}

Expand Down
Loading