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

joh/inlineDiff2 #179965

Merged
merged 12 commits into from Apr 14, 2023
Merged

joh/inlineDiff2 #179965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0817778
wip live preview
jrieken Apr 13, 2023
9567c0c
fix default width on first showing
jrieken Apr 14, 2023
bb08d36
extract some parts into preview and live strategies
jrieken Apr 14, 2023
d4a6417
update diff editor width on resize
jrieken Apr 14, 2023
0f6b227
improve hidden area in diff editor
jrieken Apr 14, 2023
f2624a2
full cancel when different model is set
jrieken Apr 14, 2023
e3888ff
tweak colors of embedded diff editor (livePreview)
jrieken Apr 14, 2023
324596d
support simple file create preview with live preview
jrieken Apr 14, 2023
006bbdf
tweak action name
jrieken Apr 14, 2023
1bb00fa
use better diff editor options
jrieken Apr 14, 2023
294bc7b
allow to pass widget options to embedded diff editor,
jrieken Apr 14, 2023
fb91cbd
Merge branch 'main' into joh/inlineDiff2
jrieken Apr 14, 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/embeddedCodeEditorWidget.ts
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import * as objects from 'vs/base/common/objects';
import { ICodeEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget';
import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditorWidget';
import { DiffEditorWidget, IDiffCodeEditorWidgetOptions } from 'vs/editor/browser/widget/diffEditorWidget';
import { ConfigurationChangedEvent, IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
Expand Down Expand Up @@ -75,6 +75,7 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
constructor(
domElement: HTMLElement,
options: Readonly<IDiffEditorConstructionOptions>,
codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
parentEditor: ICodeEditor,
@IContextKeyService contextKeyService: IContextKeyService,
@IInstantiationService instantiationService: IInstantiationService,
Expand All @@ -85,7 +86,7 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
@IClipboardService clipboardService: IClipboardService,
@IEditorProgressService editorProgressService: IEditorProgressService,
) {
super(domElement, parentEditor.getRawOptions(), {}, clipboardService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);
super(domElement, parentEditor.getRawOptions(), codeEditorWidgetOptions, clipboardService, contextKeyService, instantiationService, codeEditorService, themeService, notificationService, contextMenuService, editorProgressService);

this._parentEditor = parentEditor;
this._overwriteOptions = options;
Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css
View file
Open in desktop
Expand Up @@ -187,3 +187,9 @@
.monaco-editor .interactive-editor-slash-command-detail {
opacity: 0.5;
}

/* diff zone */

.monaco-editor .interactive-editor-diff-widget {
padding: 6px 0;
}
66 changes: 42 additions & 24 deletions src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import { Codicon } from 'vs/base/common/codicons';
import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditorAction2 } from 'vs/editor/browser/editorExtensions';
import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import { InteractiveEditorController, Recording } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController';
import { CTX_INTERACTIVE_EDITOR_FOCUSED, CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST, CTX_INTERACTIVE_EDITOR_HAS_PROVIDER, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_FIRST, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_LAST, CTX_INTERACTIVE_EDITOR_EMPTY, CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION, CTX_INTERACTIVE_EDITOR_VISIBLE, MENU_INTERACTIVE_EDITOR_WIDGET, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE, MENU_INTERACTIVE_EDITOR_WIDGET_UNDO, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK, CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_HAS_RESPONSE, CTX_INTERACTIVE_EDITOR_EDIT_MODE } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
Expand All @@ -21,6 +21,7 @@ import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/commo
import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
import { IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
import { ILogService } from 'vs/platform/log/common/log';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';

export class StartSessionAction extends EditorAction2 {

Expand Down Expand Up @@ -62,6 +63,13 @@ abstract class AbstractInteractiveEditorAction extends EditorAction2 {
}
const ctrl = InteractiveEditorController.get(editor);
if (!ctrl) {
for (const diffEditor of accessor.get(ICodeEditorService).listDiffEditors()) {
if (diffEditor.getOriginalEditor() === editor || diffEditor.getModifiedEditor() === editor) {
if (diffEditor instanceof EmbeddedDiffEditorWidget) {
this.runEditorCommand(accessor, diffEditor.getParentEditor(), ..._args);
}
}
}
return;
}
this.runInteractiveEditorCommand(accessor, ctrl, editor, ..._args);
Expand Down Expand Up @@ -124,25 +132,6 @@ export class StopRequestAction extends AbstractInteractiveEditorAction {
}
}

export class CancelSessionAction extends AbstractInteractiveEditorAction {

constructor() {
super({
id: 'interactiveEditor.cancel',
title: localize('cancel', 'Cancel'),
precondition: CTX_INTERACTIVE_EDITOR_VISIBLE,
keybinding: {
weight: KeybindingWeight.EditorContrib - 1,
primary: KeyCode.Escape
}
});
}

runInteractiveEditorCommand(_accessor: ServicesAccessor, ctrl: InteractiveEditorController, _editor: ICodeEditor, ..._args: any[]): void {
ctrl.cancelSession();
}
}

export class ArrowOutUpAction extends AbstractInteractiveEditorAction {
constructor() {
super({
Expand Down Expand Up @@ -380,7 +369,7 @@ export class ToggleInlineDiff extends AbstractInteractiveEditorAction {
id: MENU_INTERACTIVE_EDITOR_WIDGET_STATUS,
when: CTX_INTERACTIVE_EDITOR_EDIT_MODE.isEqualTo('direct'),
group: '0_main',
order: 1
order: 10
}
});
}
Expand All @@ -397,10 +386,14 @@ export class ApplyPreviewEdits extends AbstractInteractiveEditorAction {
id: 'interactiveEditor.applyEdits',
title: localize('applyEdits', 'Apply Changes'),
icon: Codicon.check,
precondition: ContextKeyExpr.and(CTX_INTERACTIVE_EDITOR_VISIBLE, CTX_INTERACTIVE_EDITOR_EDIT_MODE.isEqualTo('preview')),
precondition: ContextKeyExpr.and(CTX_INTERACTIVE_EDITOR_VISIBLE),
keybinding: {
weight: KeybindingWeight.EditorContrib + 10,
primary: KeyMod.CtrlCmd | KeyCode.Enter
},
menu: {
id: MENU_INTERACTIVE_EDITOR_WIDGET_STATUS,
when: CTX_INTERACTIVE_EDITOR_EDIT_MODE.isEqualTo('preview'),
// when: CTX_INTERACTIVE_EDITOR_EDIT_MODE.isEqualTo('preview'),
group: '0_main',
order: 0
}
Expand All @@ -415,14 +408,39 @@ export class ApplyPreviewEdits extends AbstractInteractiveEditorAction {
logService.warn('FAILED to apply changes, no edit response');
return;
}
ctrl.cancelSession();
if (edit.singleCreateFileEdit) {
editorService.openEditor({ resource: edit.singleCreateFileEdit.uri }, SIDE_GROUP);
}

}
}

export class CancelSessionAction extends AbstractInteractiveEditorAction {

constructor() {
super({
id: 'interactiveEditor.cancel',
title: localize('discard', 'Discard Changes'),
icon: Codicon.clearAll,
precondition: CTX_INTERACTIVE_EDITOR_VISIBLE,
keybinding: {
weight: KeybindingWeight.EditorContrib - 1,
primary: KeyCode.Escape
},
menu: {
id: MENU_INTERACTIVE_EDITOR_WIDGET_STATUS,
// when: CTX_INTERACTIVE_EDITOR_EDIT_MODE.isEqualTo('preview'),
jrieken marked this conversation as resolved.
Show resolved Hide resolved
group: '0_main',
order: 1
}
});
}

runInteractiveEditorCommand(_accessor: ServicesAccessor, ctrl: InteractiveEditorController, _editor: ICodeEditor, ..._args: any[]): void {
ctrl.cancelSession();
}
}

export class CopyRecordings extends AbstractInteractiveEditorAction {

constructor() {
Expand Down