Align to vscode notebook commands (#13645)

* aligned commands to vscodes commands this makes more keybindings available. Also implements to notbookOutputInputFocused context key Signed-off-by: Jonah Iden <jonah.iden@typefox.io> * fixed type and forgotten dispose of emitter Signed-off-by: Jonah Iden <jonah.iden@typefox.io> * fixed lint Signed-off-by: Jonah Iden <jonah.iden@typefox.io> --------- Signed-off-by: Jonah Iden <jonah.iden@typefox.io>
eclipse-theia · Apr 30, 2024 · c1f222d · c1f222d
1 parent 6a82f78
commit c1f222d
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 23 deletions.
diff --git a/packages/notebook/src/browser/contributions/notebook-actions-contribution.ts b/packages/notebook/src/browser/contributions/notebook-actions-contribution.ts
@@ -70,17 +70,17 @@ export namespace NotebookCommands {
     });
 
     export const CUT_SELECTED_CELL = Command.toDefaultLocalizedCommand({
-        id: 'notebook.cut-selected-cell',
+        id: 'notebook.cell.cut',
         category: 'Notebook',
     });
 
     export const COPY_SELECTED_CELL = Command.toDefaultLocalizedCommand({
-        id: 'notebook.copy-selected-cell',
+        id: 'notebook.cell.copy',
         category: 'Notebook',
     });
 
     export const PASTE_CELL = Command.toDefaultLocalizedCommand({
-        id: 'notebook.paste-cell',
+        id: 'notebook.cell.paste',
         category: 'Notebook',
     });
 }

diff --git a/packages/notebook/src/browser/contributions/notebook-cell-actions-contribution.ts b/packages/notebook/src/browser/contributions/notebook-cell-actions-contribution.ts
@@ -120,24 +120,24 @@ export namespace NotebookCellCommands {
         label: 'Change Cell to Mardown'
     });
 
-    export const COLLAPSE_CELL_OUTPUT = Command.toDefaultLocalizedCommand({
-        id: 'notebook.cell.collapseCellOutput',
+    export const TOGGLE_CELL_OUTPUT = Command.toDefaultLocalizedCommand({
+        id: 'notebook.cell.toggleOutputs',
         category: 'Notebook',
         label: 'Collapse Cell Output',
     });
 
-    export const EXPAND_CELL_OUTPUT = Command.toDefaultLocalizedCommand({
-        id: 'notebook.cell.expandCellOutput',
-        category: 'Notebook',
-        label: 'Expand Cell Output',
-    });
-
     export const CHANGE_CELL_LANGUAGE = Command.toDefaultLocalizedCommand({
         id: 'notebook.cell.changeLanguage',
         category: 'Notebook',
         label: 'Change Cell Language',
     });
 
+    export const TOGGLE_LINE_NUMBERS = Command.toDefaultLocalizedCommand({
+        id: 'notebook.cell.toggleLineNumbers',
+        category: 'Notebook',
+        label: 'Show Cell Line Numbers',
+    });
+
 }
 
 @injectable()
@@ -351,20 +351,11 @@ export class NotebookCellActionContribution implements MenuContribution, Command
             changeCellType(notebookModel, cell, CellKind.Markup);
         }));
 
-        commands.registerCommand(NotebookCellCommands.COLLAPSE_CELL_OUTPUT, {
-            execute: () => {
-                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
-                if (selectedCell) {
-                    selectedCell.outputVisible = false;
-                }
-            }
-        });
-
-        commands.registerCommand(NotebookCellCommands.EXPAND_CELL_OUTPUT, {
+        commands.registerCommand(NotebookCellCommands.TOGGLE_CELL_OUTPUT, {
             execute: () => {
                 const selectedCell = this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
                 if (selectedCell) {
-                    selectedCell.outputVisible = true;
+                    selectedCell.outputVisible = !selectedCell.outputVisible;
                 }
             }
         });
@@ -387,6 +378,16 @@ export class NotebookCellActionContribution implements MenuContribution, Command
             }
         });
 
+        commands.registerCommand(NotebookCellCommands.TOGGLE_LINE_NUMBERS, {
+            execute: () => {
+                const selectedCell = this.notebookEditorWidgetService.focusedEditor?.model?.selectedCell;
+                if (selectedCell) {
+                    const currentLineNumber = selectedCell.editorOptions?.lineNumbers;
+                    selectedCell.editorOptions = { ...selectedCell.editorOptions, lineNumbers: !currentLineNumber || currentLineNumber === 'off' ? 'on' : 'off' };
+                }
+            }
+        });
+
     }
 
     protected editableCellCommandHandler(execute: (notebookModel: NotebookModel, cell: NotebookCellModel, output?: NotebookCellOutputModel) => void): CommandHandler {

diff --git a/packages/notebook/src/browser/contributions/notebook-context-keys.ts b/packages/notebook/src/browser/contributions/notebook-context-keys.ts
@@ -30,6 +30,7 @@ export const KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED = 'notebookFindWidg
 export const NOTEBOOK_EDITOR_FOCUSED = 'notebookEditorFocused';
 export const NOTEBOOK_CELL_LIST_FOCUSED = 'notebookCellListFocused';
 export const NOTEBOOK_OUTPUT_FOCUSED = 'notebookOutputFocused';
+export const NOTEBOOK_OUTPUT_INPUT_FOCUSED = 'notebookOutputInputFocused';
 export const NOTEBOOK_EDITOR_EDITABLE = 'notebookEditable';
 export const NOTEBOOK_HAS_RUNNING_CELL = 'notebookHasRunningCell';
 export const NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON = 'notebookUseConsolidatedOutputButton';
@@ -74,6 +75,7 @@ export namespace NotebookContextKeys {
         service.createKey(NOTEBOOK_EDITOR_FOCUSED, false);
         service.createKey(NOTEBOOK_CELL_LIST_FOCUSED, false);
         service.createKey(NOTEBOOK_OUTPUT_FOCUSED, false);
+        service.createKey(NOTEBOOK_OUTPUT_INPUT_FOCUSED, false);
         service.createKey(NOTEBOOK_EDITOR_EDITABLE, true);
         service.createKey(NOTEBOOK_HAS_RUNNING_CELL, false);
         service.createKey(NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, false);

diff --git a/packages/notebook/src/browser/notebook-editor-widget.tsx b/packages/notebook/src/browser/notebook-editor-widget.tsx
@@ -120,6 +120,9 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
     protected readonly onDidReceiveKernelMessageEmitter = new Emitter<unknown>();
     readonly onDidReceiveKernelMessage = this.onDidReceiveKernelMessageEmitter.event;
 
+    protected readonly onDidChangeOutputInputFocusEmitter = new Emitter<boolean>();
+    readonly onDidChangeOutputInputFocus = this.onDidChangeOutputInputFocusEmitter.event;
+
     protected readonly renderers = new Map<CellKind, CellRenderer>();
     protected _model?: NotebookModel;
     protected _ready: Deferred<NotebookModel> = new Deferred();
@@ -251,12 +254,17 @@ export class NotebookEditorWidget extends ReactWidget implements Navigatable, Sa
         this.onDidReceiveKernelMessageEmitter.fire(message);
     }
 
+    outputInputFocusChanged(focused: boolean): void {
+        this.onDidChangeOutputInputFocusEmitter.fire(focused);
+    }
+
     override dispose(): void {
         this.notebookContextManager.dispose();
         this.onDidChangeModelEmitter.dispose();
         this.onDidPostKernelMessageEmitter.dispose();
         this.onDidReceiveKernelMessageEmitter.dispose();
         this.onPostRendererMessageEmitter.dispose();
+        this.onDidChangeOutputInputFocusEmitter.dispose();
         this.viewportService.dispose();
         this._model?.dispose();
         super.dispose();

diff --git a/packages/notebook/src/browser/service/notebook-context-manager.ts b/packages/notebook/src/browser/service/notebook-context-manager.ts
@@ -23,6 +23,7 @@ import {
     NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE,
     NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE,
     NOTEBOOK_CELL_TYPE, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_SELECTED,
+    NOTEBOOK_OUTPUT_INPUT_FOCUSED,
     NOTEBOOK_VIEW_TYPE
 } from '../contributions/notebook-context-keys';
 import { NotebookEditorWidget } from '../notebook-editor-widget';
@@ -101,6 +102,11 @@ export class NotebookContextManager {
 
         widget.model?.onDidChangeSelectedCell(e => this.selectedCellChanged(e));
 
+        widget.onDidChangeOutputInputFocus(focus => {
+            this.scopedStore.setContext(NOTEBOOK_OUTPUT_INPUT_FOCUSED, focus);
+            this.onDidChangeContextEmitter.fire(this.createContextKeyChangedEvent([NOTEBOOK_OUTPUT_INPUT_FOCUSED]));
+        });
+
         this.onDidChangeContextEmitter.fire(this.createContextKeyChangedEvent([NOTEBOOK_VIEW_TYPE, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL]));
     }
 

diff --git a/packages/plugin-ext/src/main/browser/notebooks/renderers/cell-output-webview.tsx b/packages/plugin-ext/src/main/browser/notebooks/renderers/cell-output-webview.tsx
@@ -286,6 +286,8 @@ export class CellOutputWebviewImpl implements CellOutputWebview, Disposable {
                 // console.log('from webview customKernelMessage ', JSON.stringify(message.message));
                 this.editor.recieveKernelMessage(message.message);
                 break;
+            case 'inputFocusChanged':
+                this.editor?.outputInputFocusChanged(message.focused);
         }
     }
 

diff --git a/packages/plugin-ext/src/main/browser/notebooks/renderers/output-webview-internal.ts b/packages/plugin-ext/src/main/browser/notebooks/renderers/output-webview-internal.ts
@@ -581,5 +581,15 @@ export async function outputWebviewPreload(ctx: PreloadContext): Promise<void> {
         return this.originalAppendChild(node);
     };
 
+    const focusChange = (event: FocusEvent, focus: boolean) => {
+        if (event.target instanceof HTMLInputElement) {
+            theia.postMessage({ type: 'inputFocusChanged', focused: focus } as webviewCommunication.InputFocusChange);
+        }
+    };
+
+    window.addEventListener('focusin', (event: FocusEvent) => focusChange(event, true));
+
+    window.addEventListener('focusout', (event: FocusEvent) => focusChange(event, false));
+
     theia.postMessage(<webviewCommunication.WebviewInitialized>{ type: 'initialized' });
 }
diff --git a/packages/plugin-ext/src/main/browser/notebooks/renderers/webview-communication.ts b/packages/plugin-ext/src/main/browser/notebooks/renderers/webview-communication.ts
@@ -76,7 +76,12 @@ export interface WheelMessage {
     readonly deltaX: number;
 }
 
-export type FromWebviewMessage = WebviewInitialized | OnDidRenderOutput | WheelMessage | CustomRendererMessage | KernelMessage;
+export interface InputFocusChange {
+    readonly type: 'inputFocusChanged';
+    readonly focused: boolean;
+}
+
+export type FromWebviewMessage = WebviewInitialized | OnDidRenderOutput | WheelMessage | CustomRendererMessage | KernelMessage | InputFocusChange;
 
 export interface Output {
     id: string
@@ -88,3 +93,4 @@ export interface OutputItem {
     readonly mime: string;
     readonly data: Uint8Array;
 }
+