Merge branch 'main' into jk/feat/snowflake

Author: jankuca

package.json

@@ -70,6 +70,14 @@
                 "key": "escape",
                 "when": "isCompositeNotebook && !editorHoverVisible && !suggestWidgetVisible && !isComposing && !inSnippetMode && !exceptionWidgetVisible && !selectionAnchorSet && !LinkedEditingInputVisible && !renameInputVisible && !editorHasSelection && !accessibilityHelpWidgetVisible && !breakpointWidgetVisible && !findWidgetVisible && !markersNavigationVisible && !parameterHintsVisible && !editorHasMultipleSelections && !notificationToastsVisible && !notebookEditorFocused && !inlineChatVisible",
                 "command": "interactive.input.clear"
+            },
+            {
+                "key": "cmd+enter",
+                "mac": "cmd+enter",
+                "win": "ctrl+enter",
+                "linux": "ctrl+enter",
+                "when": "notebookEditorFocused && !findInputFocussed && !replaceInputFocussed",
+                "command": "jupyter.notebookeditor.runfocusedcell"
             }
         ],
         "commands": [
@@ -544,6 +552,12 @@
                 "category": "Notebook",
                 "enablement": "!jupyter.webExtension"
             },
+            {
+                "command": "jupyter.notebookeditor.runfocusedcell",
+                "title": "%jupyter.command.jupyter.notebookeditor.runfocusedcell.title%",
+                "category": "Notebook",
+                "enablement": "notebookEditorFocused"
+            },
             {
                 "command": "jupyter.expandallcells",
                 "title": "%jupyter.command.jupyter.expandallcells.title%",
@@ -714,9 +728,30 @@
             {
                 "id": "editor.interactiveWindow.context",
                 "label": "%jupyter.command.editor.interactiveWindow.context.label%"
+            },
+            {
+                "id": "deepnote.explorer.context",
+                "label": "Deepnote"
             }
         ],
         "menus": {
+            "view/title": [
+                {
+                    "command": "deepnote.newProject",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "deepnote.importNotebook",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "deepnote.refreshExplorer",
+                    "when": "view == deepnoteExplorer",
+                    "group": "navigation@3"
+                }
+            ],
             "editor/context": [
                 {
                     "submenu": "editor.interactiveWindow.context",
@@ -765,6 +800,14 @@
                     "when": "editorFocus && editorLangId == python && !notebookEditorFocused && isWorkspaceTrusted"
                 }
             ],
+            "deepnote.explorer.context": [
+                {
+                    "command": "deepnote.newProject"
+                },
+                {
+                    "command": "deepnote.importNotebook"
+                }
+            ],
             "editor/title": [
                 {
                     "command": "jupyter.restartkernel",
@@ -937,6 +980,11 @@
                 }
             ],
             "explorer/context": [
+                {
+                    "submenu": "deepnote.explorer.context",
+                    "when": "isWorkspaceTrusted",
+                    "group": "navigation@10"
+                },
                 {
                     "when": "resourceLangId == python && !notebookEditorFocused && isWorkspaceTrusted",
                     "command": "jupyter.runFileInteractive",

package.nls.json

@@ -92,6 +92,7 @@
         "message": "Add Empty Cell to Notebook File",
         "comment": ["{Locked='Notebook'}"]
     },
+    "jupyter.command.jupyter.notebookeditor.runfocusedcell.title": "Run Focused Cell",
     "jupyter.command.jupyter.interruptkernel.title": "Interrupt Kernel",
     "jupyter.command.jupyter.interruptkernel.shorttitle": "Interrupt",
     "jupyter.command.jupyter.restartkernel.title": "Restart Kernel",

src/commands.ts

@@ -58,6 +58,7 @@ export interface ICommandNameArgumentTypeMapping {
     [DSCommands.RestartKernelAndRunUpToSelectedCell]: [{ notebookEditor: { notebookUri: Uri } } | undefined];
     [DSCommands.NotebookEditorRemoveAllCells]: [];
     [DSCommands.NotebookEditorRunAllCells]: [];
+    [DSCommands.NotebookEditorRunFocusedCell]: [];
     [DSCommands.NotebookEditorAddCellBelow]: [];
     [DSCommands.ExpandAllCells]: [];
     [DSCommands.CollapseAllCells]: [];

src/notebooks/notebookCommandListener.ts

@@ -68,6 +68,9 @@ export class NotebookCommandListener implements INotebookCommandHandler, IExtens
         this.disposableRegistry.push(
             commands.registerCommand(Commands.NotebookEditorRunAllCells, () => this.runAllCells())
         );
+        this.disposableRegistry.push(
+            commands.registerCommand(Commands.NotebookEditorRunFocusedCell, () => this.runFocusedCell())
+        );
         this.disposableRegistry.push(
             commands.registerCommand(Commands.NotebookEditorAddCellBelow, () => this.addCellBelow())
         );
@@ -115,6 +118,27 @@ export class NotebookCommandListener implements INotebookCommandHandler, IExtens
         }
     }
 
+    private runFocusedCell() {
+        const editor = window.activeNotebookEditor;
+        if (!editor) {
+            return;
+        }
+
+        // Get the first selection range
+        const range = editor.selections[0];
+        if (!range) {
+            return;
+        }
+
+        // Execute the cell at the start of the selection
+        commands
+            .executeCommand('notebook.cell.execute', {
+                ranges: [{ start: range.start, end: range.start + 1 }],
+                document: editor.notebook.uri
+            })
+            .then(noop, noop);
+    }
+
     private addCellBelow() {
         if (window.activeNotebookEditor) {
             commands.executeCommand('notebook.cell.insertCodeCellBelow').then(noop, noop);

src/platform/common/constants.ts

@@ -189,6 +189,7 @@ export namespace Commands {
     export const NotebookEditorRemoveAllCells = 'jupyter.notebookeditor.removeallcells';
     export const NotebookEditorRunAllCells = 'jupyter.notebookeditor.runallcells';
     export const NotebookEditorRunSelectedCell = 'jupyter.notebookeditor.runselectedcell';
+    export const NotebookEditorRunFocusedCell = 'jupyter.notebookeditor.runfocusedcell';
     export const NotebookEditorAddCellBelow = 'jupyter.notebookeditor.addcellbelow';
     export const ExpandAllCells = 'jupyter.expandallcells';
     export const CollapseAllCells = 'jupyter.collapseallcells';