From de226ee83bda4182e4a27377980e1c16c95cb59d Mon Sep 17 00:00:00 2001 From: Aaron Munger Date: Fri, 30 Aug 2024 13:44:06 -0700 Subject: [PATCH 1/2] new context key --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index bb7166c7bdf..f69d65529c6 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ { "command": "jupyter.execSelectionInteractive", "key": "shift+enter", - "when": "editorTextFocus && editorLangId == python && !findInputFocussed && !replaceInputFocussed && jupyter.ownsSelection && !notebookEditorFocused && activeEditor != 'workbench.editor.interactive'" + "when": "editorTextFocus && editorLangId == python && !findInputFocussed && !replaceInputFocussed && jupyter.ownsSelection && !notebookEditorFocused && !isCompositeNotebook" }, { "command": "jupyter.runcurrentcelladvance", @@ -146,7 +146,7 @@ }, { "key": "escape", - "when": "activeEditor == 'workbench.editor.interactive' && !editorHoverVisible && !suggestWidgetVisible && !isComposing && !inSnippetMode && !exceptionWidgetVisible && !selectionAnchorSet && !LinkedEditingInputVisible && !renameInputVisible && !editorHasSelection && !accessibilityHelpWidgetVisible && !breakpointWidgetVisible && !findWidgetVisible && !markersNavigationVisible && !parameterHintsVisible && !editorHasMultipleSelections && !notificationToastsVisible", + "when": "isCompositeNotebook && !editorHoverVisible && !suggestWidgetVisible && !isComposing && !inSnippetMode && !exceptionWidgetVisible && !selectionAnchorSet && !LinkedEditingInputVisible && !renameInputVisible && !editorHasSelection && !accessibilityHelpWidgetVisible && !breakpointWidgetVisible && !findWidgetVisible && !markersNavigationVisible && !parameterHintsVisible && !editorHasMultipleSelections && !notificationToastsVisible", "command": "interactive.input.clear" }, { @@ -686,7 +686,7 @@ "shortTitle": "%jupyter.command.jupyter.openVariableView.shorttitle%", "icon": "$(variable-group)", "category": "Jupyter", - "enablement": "notebookType == jupyter-notebook && isWorkspaceTrusted || notebookType == interactive && isWorkspaceTrusted" + "enablement": "notebookType == jupyter-notebook && isWorkspaceTrusted || isCompositeNotebook && isWorkspaceTrusted" }, { "command": "jupyter.openOutlineView", @@ -2365,4 +2365,4 @@ }, "d3-color": "3.1.0" } -} +} \ No newline at end of file From cddeed6d480b9ffe10be89b76eaaadf13713d5f6 Mon Sep 17 00:00:00 2001 From: Aaron Munger Date: Fri, 30 Aug 2024 15:24:02 -0700 Subject: [PATCH 2/2] re-add final newline --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f69d65529c6..e5b3052ab73 100644 --- a/package.json +++ b/package.json @@ -2365,4 +2365,4 @@ }, "d3-color": "3.1.0" } -} \ No newline at end of file +}