From 205b7f35a1137bbdcd28e0c9d621772ba2a0835f Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 26 Apr 2023 15:04:53 +0200 Subject: [PATCH 1/2] disable inline completions for inline chat input fixes https://github.com/microsoft/vscode-internalbacklog/issues/3961 --- .../interactiveEditor/browser/interactiveEditorWidget.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts index 830208e857369..ef84e4c602ce7 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts @@ -25,7 +25,6 @@ import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetCon import { IModelService } from 'vs/editor/common/services/model'; import { URI } from 'vs/base/common/uri'; import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; -import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController'; import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar'; import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController'; @@ -166,7 +165,6 @@ class InteractiveEditorWidget { isSimpleWidget: true, contributions: EditorExtensionsRegistry.getSomeEditorContributions([ SnippetController2.ID, - InlineCompletionsController.ID, SuggestController.ID ]) }; From 38d3566eacd0cb63f7855acfd9f5af9f1047cf83 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 26 Apr 2023 15:07:14 +0200 Subject: [PATCH 2/2] disabe cmd/ctrl+z for "special undo" of inline chat fixes https://github.com/microsoft/vscode-internalbacklog/issues/3966 --- .../interactiveEditor/browser/interactiveEditorActions.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts index 94cab1eebf37d..6d39be57d9084 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts @@ -314,10 +314,10 @@ export class UndoCommand extends AbstractInteractiveEditorAction { title: localize('undo', 'Undo'), icon: Codicon.commentDiscussion, precondition: ContextKeyExpr.and(CTX_INTERACTIVE_EDITOR_VISIBLE, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE.isEqualTo('simple')), - keybinding: { - weight: KeybindingWeight.EditorContrib + 10, - primary: KeyMod.CtrlCmd | KeyCode.KeyZ, - }, + // keybinding: { + // weight: KeybindingWeight.EditorContrib + 10, + // primary: KeyMod.CtrlCmd | KeyCode.KeyZ, + // }, menu: { when: CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE.isEqualTo('simple'), id: MENU_INTERACTIVE_EDITOR_WIDGET_UNDO,