Issue 12414 python interactive cell editing shortcuts

news/1 Enhancements/12414.md

@@ -0,0 +1 @@
+Add cell editing shortcuts for python interactive cells. Thanks [@earthastronaut](https://github.com/earthastronaut/)!

package.json

@@ -503,6 +503,66 @@
                 "title": "%python.command.python.datascience.debugcontinue.title%",
                 "category": "Python"
             },
+            {
+                "command": "python.datascience.insertCellBelowPosition",
+                "title": "%python.command.python.datascience.insertCellBelowPosition.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.insertCellBelow",
+                "title": "%python.command.python.datascience.insertCellBelow.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.insertCellAbove",
+                "title": "%python.command.python.datascience.insertCellAbove.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.deleteCells",
+                "title": "%python.command.python.datascience.deleteCells.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.selectCell",
+                "title": "%python.command.python.datascience.selectCell.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.selectCellContents",
+                "title": "%python.command.python.datascience.selectCellContents.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.extendSelectionByCellAbove",
+                "title": "%python.command.python.datascience.extendSelectionByCellAbove.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.extendSelectionByCellBelow",
+                "title": "%python.command.python.datascience.extendSelectionByCellBelow.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.moveCellsUp",
+                "title": "%python.command.python.datascience.moveCellsUp.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.moveCellsDown",
+                "title": "%python.command.python.datascience.moveCellsDown.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.changeCellToMarkdown",
+                "title": "%python.command.python.datascience.changeCellToMarkdown.title%",
+                "category": "Python"
+            },
+            {
+                "command": "python.datascience.changeCellToCode",
+                "title": "%python.command.python.datascience.changeCellToCode.title%",
+                "category": "Python"
+            },
             {
                 "command": "python.datascience.runcurrentcelladvance",
                 "title": "%python.command.python.datascience.runcurrentcelladvance.title%",
@@ -942,6 +1002,78 @@
                     "category": "Python",
                     "when": "config.noExists"
                 },
+                {
+                    "command": "python.datascience.insertCellBelowPosition",
+                    "title": "%python.command.python.datascience.insertCellBelowPosition.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.insertCellBelow",
+                    "title": "%python.command.python.datascience.insertCellBelow.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.insertCellAbove",
+                    "title": "%python.command.python.datascience.insertCellAbove.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.deleteCells",
+                    "title": "%python.command.python.datascience.deleteCells.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.selectCell",
+                    "title": "%python.command.python.datascience.selectCell.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.selectCellContents",
+                    "title": "%python.command.python.datascience.selectCellContents.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.extendSelectionByCellAbove",
+                    "title": "%python.command.python.datascience.extendSelectionByCellAbove.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.extendSelectionByCellBelow",
+                    "title": "%python.command.python.datascience.extendSelectionByCellBelow.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.moveCellsUp",
+                    "title": "%python.command.python.datascience.moveCellsUp.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.moveCellsDown",
+                    "title": "%python.command.python.datascience.moveCellsDown.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.changeCellToMarkdown",
+                    "title": "%python.command.python.datascience.changeCellToMarkdown.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
+                {
+                    "command": "python.datascience.changeCellToCode",
+                    "title": "%python.command.python.datascience.changeCellToCode.title%",
+                    "category": "Python",
+                    "when": "python.datascience.hascodecells && python.datascience.featureenabled && python.datascience.ispythonornativeactive"
+                },
                 {
                     "command": "python.datascience.runcurrentcell",
                     "title": "%python.command.python.datascience.runcurrentcell.title%",

package.nls.json

@@ -64,6 +64,18 @@
     "python.command.python.datascience.runcurrentcelladvance.title": "Run Current Cell And Advance",
     "python.command.python.datascience.execSelectionInteractive.title": "Run Selection/Line in Python Interactive Window",
     "python.command.python.datascience.runcell.title": "Run Cell",
+    "python.command.python.datascience.insertCellBelowPosition.title": "Insert Cell Below Position",
+    "python.command.python.datascience.insertCellBelow.title": "Insert Cell Below",
+    "python.command.python.datascience.insertCellAbove.title": "Insert Cell Above",
+    "python.command.python.datascience.deleteCells.title": "Delete Selected Cells",
+    "python.command.python.datascience.selectCell.title": "Select Cell",
+    "python.command.python.datascience.selectCellContents.title": "Select Cell Contents",
+    "python.command.python.datascience.extendSelectionByCellAbove.title": "Extend Selection By Cell Above",
+    "python.command.python.datascience.extendSelectionByCellBelow.title": "Extend Selection By Cell Below",
+    "python.command.python.datascience.moveCellsUp.title": "Move Selected Cells Up",
+    "python.command.python.datascience.moveCellsDown.title": "Move Selected Cells Down",
+    "python.command.python.datascience.changeCellToMarkdown.title": "Change Cell to Markdown",
+    "python.command.python.datascience.changeCellToCode.title": "Change Cell to Code",
     "python.command.python.datascience.showhistorypane.title": "Show Python Interactive Window",
     "python.command.python.datascience.selectjupyteruri.title": "Specify local or remote Jupyter server for connections",
     "python.command.python.datascience.selectjupytercommandline.title": "Specify Jupyter command line arguments",

src/client/common/application/commands.ts

@@ -170,6 +170,18 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [DSCommands.DebugStop]: [];
     [DSCommands.DebugContinue]: [];
     [DSCommands.RunCurrentCellAndAddBelow]: [string];
+    [DSCommands.InsertCellBelowPosition]: [];
+    [DSCommands.InsertCellBelow]: [];
+    [DSCommands.InsertCellAbove]: [];
+    [DSCommands.DeleteCells]: [];
+    [DSCommands.SelectCell]: [];
+    [DSCommands.SelectCellContents]: [];
+    [DSCommands.ExtendSelectionByCellAbove]: [];
+    [DSCommands.ExtendSelectionByCellBelow]: [];
+    [DSCommands.MoveCellsUp]: [];
+    [DSCommands.MoveCellsDown]: [];
+    [DSCommands.ChangeCellToMarkdown]: [];
+    [DSCommands.ChangeCellToCode]: [];
     [DSCommands.ScrollToCell]: [string, string];
     [DSCommands.ViewJupyterOutput]: [];
     [DSCommands.ExportAsPythonScript]: [INotebookModel];

src/client/datascience/cellFactory.ts

@@ -12,7 +12,7 @@ import { IDataScienceSettings, Resource } from '../common/types';
 import { noop } from '../common/utils/misc';
 import { CellMatcher } from './cellMatcher';
 import { Identifiers } from './constants';
-import { CellState, ICell } from './types';
+import { CellState, ICell, ICellRange } from './types';
 
 function generateCodeCell(
     code: string[],
@@ -109,13 +109,6 @@ export function hasCells(document: TextDocument, settings?: IDataScienceSettings
     return false;
 }
 
-// CellRange is used as the basis for creating new ICells. We only use it in this file.
-export interface ICellRange {
-    range: Range;
-    title: string;
-    cell_type: string;
-}
-
 export function generateCellsFromString(source: string, settings?: IDataScienceSettings): ICell[] {
     const lines: string[] = source.splitLines({ trim: false, removeEmptyEntries: false });
 

src/client/datascience/cellMatcher.ts

@@ -8,10 +8,11 @@ import { noop } from '../common/utils/misc';
 import { RegExpValues } from './constants';
 
 export class CellMatcher {
+    public codeExecRegEx: RegExp;
+    public markdownExecRegEx: RegExp;
+
     private codeMatchRegEx: RegExp;
     private markdownMatchRegEx: RegExp;
-    private codeExecRegEx: RegExp;
-    private markdownExecRegEx: RegExp;
     private defaultCellMarker: string;
     private defaultCellMarkerExec: RegExp;
 

src/client/datascience/commands/commandRegistry.ts

@@ -62,6 +62,18 @@ export class CommandRegistry implements IDisposable {
         this.registerCommand(Commands.ExecSelectionInInteractiveWindow, this.runSelectionOrLine);
         this.registerCommand(Commands.RunAllCellsAbove, this.runAllCellsAbove);
         this.registerCommand(Commands.RunCellAndAllBelow, this.runCellAndAllBelow);
+        this.registerCommand(Commands.InsertCellBelowPosition, this.insertCellBelowPosition);
+        this.registerCommand(Commands.InsertCellBelow, this.insertCellBelow);
+        this.registerCommand(Commands.InsertCellAbove, this.insertCellAbove);
+        this.registerCommand(Commands.DeleteCells, this.deleteCells);
+        this.registerCommand(Commands.SelectCell, this.selectCell);
+        this.registerCommand(Commands.SelectCellContents, this.selectCellContents);
+        this.registerCommand(Commands.ExtendSelectionByCellAbove, this.extendSelectionByCellAbove);
+        this.registerCommand(Commands.ExtendSelectionByCellBelow, this.extendSelectionByCellBelow);
+        this.registerCommand(Commands.MoveCellsUp, this.moveCellsUp);
+        this.registerCommand(Commands.MoveCellsDown, this.moveCellsDown);
+        this.registerCommand(Commands.ChangeCellToMarkdown, this.changeCellToMarkdown);
+        this.registerCommand(Commands.ChangeCellToCode, this.changeCellToCode);
         this.registerCommand(Commands.RunAllCellsAbovePalette, this.runAllCellsAboveFromCursor);
         this.registerCommand(Commands.RunCellAndAllBelowPalette, this.runCellAndAllBelowFromCursor);
         this.registerCommand(Commands.RunToLine, this.runToLine);
@@ -305,6 +317,114 @@ export class CommandRegistry implements IDisposable {
         }
     }
 
+    private async insertCellBelowPosition(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.insertCellBelowPosition();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async insertCellBelow(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.insertCellBelow();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async insertCellAbove(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.insertCellAbove();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async deleteCells(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.deleteCells();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async selectCell(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.selectCell();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async selectCellContents(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.selectCellContents();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async extendSelectionByCellAbove(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.extendSelectionByCellAbove();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async extendSelectionByCellBelow(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.extendSelectionByCellBelow();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async moveCellsUp(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.moveCellsUp();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async moveCellsDown(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.moveCellsDown();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async changeCellToMarkdown(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.changeCellToMarkdown();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
+    private async changeCellToCode(): Promise<void> {
+        const activeCodeWatcher = this.getCurrentCodeWatcher();
+        if (activeCodeWatcher) {
+            return activeCodeWatcher.changeCellToCode();
+        } else {
+            return Promise.resolve();
+        }
+    }
+
     private async runAllCellsAboveFromCursor(): Promise<void> {
         const currentCodeLens = this.getCurrentCodeLens();
         if (currentCodeLens) {

src/client/datascience/constants.ts

@@ -77,6 +77,18 @@ export namespace Commands {
     export const DebugContinue = 'python.datascience.debugcontinue';
     export const DebugStop = 'python.datascience.debugstop';
     export const RunCurrentCellAndAddBelow = 'python.datascience.runcurrentcellandaddbelow';
+    export const InsertCellBelowPosition = 'python.datascience.insertCellBelowPosition';
+    export const InsertCellBelow = 'python.datascience.insertCellBelow';
+    export const InsertCellAbove = 'python.datascience.insertCellAbove';
+    export const DeleteCells = 'python.datascience.deleteCells';
+    export const SelectCell = 'python.datascience.selectCell';
+    export const SelectCellContents = 'python.datascience.selectCellContents';
+    export const ExtendSelectionByCellAbove = 'python.datascience.extendSelectionByCellAbove';
+    export const ExtendSelectionByCellBelow = 'python.datascience.extendSelectionByCellBelow';
+    export const MoveCellsUp = 'python.datascience.moveCellsUp';
+    export const MoveCellsDown = 'python.datascience.moveCellsDown';
+    export const ChangeCellToMarkdown = 'python.datascience.changeCellToMarkdown';
+    export const ChangeCellToCode = 'python.datascience.changeCellToCode';
     export const ScrollToCell = 'python.datascience.scrolltocell';
     export const CreateNewNotebook = 'python.datascience.createnewnotebook';
     export const ViewJupyterOutput = 'python.datascience.viewJupyterOutput';
@@ -156,6 +168,20 @@ export enum Telemetry {
     RunAllCells = 'DATASCIENCE.RUN_ALL_CELLS',
     RunAllCellsAbove = 'DATASCIENCE.RUN_ALL_CELLS_ABOVE',
     RunCellAndAllBelow = 'DATASCIENCE.RUN_CELL_AND_ALL_BELOW',
+    AddEmptyCellToBottom = 'DATASCIENCE.RUN_ADD_EMPTY_CELL_TO_BOTTOM',
+    RunCurrentCellAndAddBelow = 'DATASCIENCE.RUN_CURRENT_CELL_AND_ADD_BELOW',
+    InsertCellBelowPosition = 'DATASCIENCE.RUN_INSERT_CELL_BELOW_POSITION',
+    InsertCellBelow = 'DATASCIENCE.RUN_INSERT_CELL_BELOW',
+    InsertCellAbove = 'DATASCIENCE.RUN_INSERT_CELL_ABOVE',
+    DeleteCells = 'DATASCIENCE.RUN_DELETE_CELLS',
+    SelectCell = 'DATASCIENCE.RUN_SELECT_CELL',
+    SelectCellContents = 'DATASCIENCE.RUN_SELECT_CELL_CONTENTS',
+    ExtendSelectionByCellAbove = 'DATASCIENCE.RUN_EXTEND_SELECTION_BY_CELL_ABOVE',
+    ExtendSelectionByCellBelow = 'DATASCIENCE.RUN_EXTEND_SELECTION_BY_CELL_BELOW',
+    MoveCellsUp = 'DATASCIENCE.RUN_MOVE_CELLS_UP',
+    MoveCellsDown = 'DATASCIENCE.RUN_MOVE_CELLS_DOWN',
+    ChangeCellToMarkdown = 'DATASCIENCE.RUN_CHANGE_CELL_TO_MARKDOWN',
+    ChangeCellToCode = 'DATASCIENCE.RUN_CHANGE_CELL_TO_CODE',
     RunSelectionOrLine = 'DATASCIENCE.RUN_SELECTION_OR_LINE',
     RunToLine = 'DATASCIENCE.RUN_TO_LINE',
     RunFromLine = 'DATASCIENCE.RUN_FROM_LINE',