Ctrl+Enter should put cell into command mode after executing (#6231)

microsoft · Jun 11, 2021 · e80d967 · e80d967
1 parent e052f2e
commit e80d967
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/news/2 Fixes/6198.md b/news/2 Fixes/6198.md
@@ -0,0 +1 @@
+In preview native notebooks interface, contribute `ctrl+enter` keybinding which puts the current cell into control mode instead of leaving it in edit mode after running.
diff --git a/package.json b/package.json
@@ -175,7 +175,7 @@
             {
                 "key": "ctrl+enter",
                 "when": "editorTextFocus && inputFocus && notebookEditorFocused && notebookType == jupyter-notebook && config.jupyter.enableKeyboardShortcuts",
-                "command": "notebook.cell.execute"
+                "command": "jupyter.notebookeditor.keybind.executeCell"
             },
             {
                 "key": "ctrl+enter",

diff --git a/src/client/common/application/commands.ts b/src/client/common/application/commands.ts
@@ -53,6 +53,7 @@ interface ICommandNameWithoutArgumentTypeMapping {
     [DSCommands.ResetLoggingLevel]: [];
     [DSCommands.OpenVariableView]: [];
     [DSCommands.NotebookEditorToggleOutput]: [];
+    [DSCommands.NotebookEditorKeybindExecuteCell]: [];
     [DSCommands.NotebookEditorKeybindRenderMarkdownAndSelectBelow]: [];
     ['notebook.cell.quitEdit']: [];
     ['notebook.cell.executeAndSelectBelow']: [];

diff --git a/src/client/datascience/commands/notebookCommands.ts b/src/client/datascience/commands/notebookCommands.ts
@@ -39,6 +39,7 @@ export class NotebookCommands implements IDisposable {
             this.commandManager.registerCommand(Commands.NotebookEditorKeybindSave, this.keybindSave, this),
             this.commandManager.registerCommand(Commands.NotebookEditorKeybindUndo, this.keybindUndo, this),
             this.commandManager.registerCommand(Commands.NotebookEditorToggleOutput, this.toggleOutput, this),
+            this.commandManager.registerCommand(Commands.NotebookEditorKeybindExecuteCell, this.executeCell, this),
             this.commandManager.registerCommand(
                 Commands.NotebookEditorKeybindRenderMarkdownAndSelectBelow,
                 this.renderMarkdownAndSelectBelow,
@@ -56,6 +57,12 @@ export class NotebookCommands implements IDisposable {
         }
     }
 
+    private executeCell() {
+        void this.commandManager
+            .executeCommand('notebook.cell.execute')
+            .then(() => this.commandManager.executeCommand('notebook.cell.quitEdit'));
+    }
+
     private renderMarkdownAndSelectBelow() {
         void this.commandManager
             .executeCommand('notebook.cell.quitEdit')

diff --git a/src/client/datascience/constants.ts b/src/client/datascience/constants.ts
@@ -164,6 +164,7 @@ export namespace Commands {
     export const NotebookEditorKeybindUndo = 'jupyter.notebookeditor.keybind.undo';
     export const NotebookEditorKeybindRenderMarkdownAndSelectBelow =
         'jupyter.notebookeditor.keybind.renderMarkdownAndSelectBelow';
+    export const NotebookEditorKeybindExecuteCell = 'jupyter.notebookeditor.keybind.executeCell';
     export const NotebookEditorToggleOutput = 'jupyter.notebookeditor.keybind.toggleOutput';
 }