From 6cceea8a8a112f8ad8ca33a563630146fa99d33a Mon Sep 17 00:00:00 2001 From: rebornix Date: Wed, 30 Jun 2021 13:16:53 -0700 Subject: [PATCH] history command should not activate when suggest widget is visible. --- .../contrib/interactive/browser/interactive.contribution.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts index c249cb17817..a7b18ce6c16 100644 --- a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts +++ b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts @@ -41,6 +41,7 @@ import { INTERACTIVE_INPUT_CURSOR_BOUNDARY } from 'vs/workbench/contrib/interact import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService'; import { IInteractiveDocumentService, InteractiveDocumentService } from 'vs/workbench/contrib/interactive/browser/interactiveDocumentService'; import { IEditorOverrideService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorOverrideService'; +import { Context as SuggestContext } from 'vs/editor/contrib/suggest/suggest'; Registry.as(EditorExtensions.Editors).registerEditor( @@ -409,6 +410,7 @@ registerAction2(class extends Action2 { ContextKeyExpr.equals('resourceScheme', Schemas.vscodeInteractive), INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('bottom'), INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none'), + SuggestContext.Visible.toNegated() ), primary: KeyCode.UpArrow, weight: KeybindingWeight.WorkbenchContrib @@ -447,6 +449,7 @@ registerAction2(class extends Action2 { ContextKeyExpr.equals('resourceScheme', Schemas.vscodeInteractive), INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('top'), INTERACTIVE_INPUT_CURSOR_BOUNDARY.notEqualsTo('none'), + SuggestContext.Visible.toNegated() ), primary: KeyCode.DownArrow, weight: KeybindingWeight.WorkbenchContrib