Revert "Port #6025 to release (#6103)"

This reverts commit 06f396a.

CHANGELOG.md

@@ -22,8 +22,6 @@
    ([#5954](https://github.com/Microsoft/vscode-jupyter/issues/5954))
 1. Tweak variable view fit and finish to match VS Code.
    ([#5955](https://github.com/Microsoft/vscode-jupyter/issues/5955))
-1. Replace 'Run cells above' and 'Run cell and below' commands and cell toolbar buttons with VS Code's built-in 'Execute Above Cells' and 'Execute Cell And Below' commands and unified run button.
-   ([#6025](https://github.com/microsoft/vscode-jupyter/issues/6025))
 
 ### Fixes
 

package.json

@@ -299,6 +299,20 @@
                 },
                 "enablement": "notebookType == jupyter-notebook && isWorkspaceTrusted"
             },
+            {
+                "command": "jupyter.notebookeditor.runallcellsabove",
+                "title": "%DataScience.runAbove%",
+                "category": "Notebook",
+                "icon": "$(run-above)",
+                "enablement": "notebookType == jupyter-notebook && isWorkspaceTrusted"
+            },
+            {
+                "command": "jupyter.notebookeditor.runcellandallbelow",
+                "title": "%DataScience.runBelow%",
+                "category": "Notebook",
+                "icon": "$(run-below)",
+                "enablement": "notebookType == jupyter-notebook && isWorkspaceTrusted"
+            },
             {
                 "command": "jupyter.export",
                 "title": "%DataScience.notebookExportAs%",
@@ -844,6 +858,20 @@
                     "when": "notebookType == 'jupyter-notebook' && isWorkspaceTrusted"
                 }
             ],
+            "notebook/cell/title": [
+                {
+                    "command": "jupyter.notebookeditor.runallcellsabove",
+                    "title": "%DataScience.runAbove%",
+                    "group": "inline/cell@0",
+                    "when": "notebookType == 'jupyter-notebook' && isWorkspaceTrusted"
+                },
+                {
+                    "command": "jupyter.notebookeditor.runcellandallbelow",
+                    "title": "%DataScience.runBelow%",
+                    "group": "inline/cell@0",
+                    "when": "notebookType == 'jupyter-notebook' && isWorkspaceTrusted"
+                }
+            ],
             "notebook/toolbar": [
                 {
                     "command": "jupyter.notebookeditor.restartkernel",
@@ -894,6 +922,16 @@
                     "title": "%DataScience.toggleCellOutput%",
                     "when": "notebookType == jupyter-notebook"
                 },
+                {
+                    "command": "jupyter.notebookeditor.runallcellsabove",
+                    "title": "%DataScience.runAbove%",
+                    "when": "notebookEditorFocused && notebookType == 'jupyter-notebook' && isWorkspaceTrusted"
+                },
+                {
+                    "command": "jupyter.notebookeditor.runcellandallbelow",
+                    "title": "%DataScience.runBelow%",
+                    "when": "notebookEditorFocused && notebookType == 'jupyter-notebook' && isWorkspaceTrusted"
+                },
                 {
                     "command": "jupyter.exportAsPythonScript",
                     "title": "%jupyter.command.jupyter.exportAsPythonScript.title%",

package.nls.json

@@ -384,6 +384,8 @@
     "DataScience.insertAbove": "Insert cell above",
     "DataScience.addCell": "Add cell",
     "DataScience.runAll": "Run all cells",
+    "DataScience.runAbove": "Run cells above",
+    "DataScience.runBelow": "Run cell and below",
     "DataScience.toggleCellOutput": "Toggle Cell Output",
     "DataScience.convertingToPythonFile": "Converting ipynb to python file",
     "DataScience.untitledNotebookMessage": "Your changes will be lost if you don't save them.",

src/client/common/application/commands.ts

@@ -3,7 +3,7 @@
 
 'use strict';
 
-import { CancellationToken, Position, TextDocument, Uri } from 'vscode';
+import { CancellationToken, NotebookCell, Position, TextDocument, Uri } from 'vscode';
 import { Commands as DSCommands } from '../../datascience/constants';
 import { IShowDataViewerFromVariablePanel } from '../../datascience/interactive-common/interactiveWindowTypes';
 import { KernelConnectionMetadata } from '../../datascience/jupyter/kernels/types';
@@ -93,6 +93,8 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [DSCommands.RunCell]: [Uri, number, number, number, number];
     [DSCommands.RunAllCellsAbove]: [Uri, number, number];
     [DSCommands.RunCellAndAllBelow]: [Uri, number, number];
+    [DSCommands.NativeNotebookRunAllCellsAbove]: [NotebookCell];
+    [DSCommands.NativeNotebookRunCellAndAllBelow]: [NotebookCell];
     [DSCommands.RunAllCellsAbovePalette]: [];
     [DSCommands.RunCellAndAllBelowPalette]: [];
     [DSCommands.DebugCurrentCellPalette]: [];

src/client/datascience/constants.ts

@@ -78,6 +78,8 @@ export namespace Commands {
     export const RunAllCells = 'jupyter.runallcells';
     export const RunAllCellsAbove = 'jupyter.runallcellsabove';
     export const RunCellAndAllBelow = 'jupyter.runcellandallbelow';
+    export const NativeNotebookRunAllCellsAbove = 'jupyter.notebookeditor.runallcellsabove';
+    export const NativeNotebookRunCellAndAllBelow = 'jupyter.notebookeditor.runcellandallbelow';
     export const SetJupyterKernel = 'jupyter.setKernel';
     export const SwitchJupyterKernel = 'jupyter.switchKernel';
     export const RunAllCellsAbovePalette = 'jupyter.runallcellsabove.palette';

src/client/datascience/interactive-ipynb/nativeEditor.ts

@@ -437,6 +437,13 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
         throw Error('Not implemented Exception');
     }
 
+    public runAbove(): void {
+        throw Error('Not implemented Exception');
+    }
+    public runCellAndBelow(): void {
+        throw Error('Not implemented Exception');
+    }
+
     protected addSysInfo(reason: SysInfoReason): Promise<void> {
         // We need to send a message when restarting
         if (reason === SysInfoReason.Restart || reason === SysInfoReason.New) {

src/client/datascience/interactive-ipynb/nativeEditorCommandListener.ts

@@ -5,9 +5,9 @@ import '../../common/extensions';
 
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
-import { Uri } from 'vscode';
+import { NotebookCell, Uri } from 'vscode';
 
-import { ICommandManager } from '../../common/application/types';
+import { ICommandManager, IVSCodeNotebook } from '../../common/application/types';
 import { traceError, traceInfo } from '../../common/logger';
 import { IDisposableRegistry } from '../../common/types';
 import { captureTelemetry } from '../../telemetry';
@@ -20,6 +20,7 @@ export class NativeEditorCommandListener implements IDataScienceCommandListener
     constructor(
         @inject(IDisposableRegistry) private disposableRegistry: IDisposableRegistry,
         @inject(INotebookEditorProvider) private provider: INotebookEditorProvider,
+        @inject(IVSCodeNotebook) private readonly notebook: IVSCodeNotebook,
         @inject(IDataScienceErrorHandler) private dataScienceErrorHandler: IDataScienceErrorHandler
     ) {}
 
@@ -54,6 +55,14 @@ export class NativeEditorCommandListener implements IDataScienceCommandListener
         this.disposableRegistry.push(
             commandManager.registerCommand(Commands.NotebookEditorAddCellBelow, () => this.addCellBelow())
         );
+        this.disposableRegistry.push(
+            commandManager.registerCommand(Commands.NativeNotebookRunAllCellsAbove, (cell) => this.runAbove(cell))
+        );
+        this.disposableRegistry.push(
+            commandManager.registerCommand(Commands.NativeNotebookRunCellAndAllBelow, (cell) =>
+                this.runCellAndBelow(cell)
+            )
+        );
     }
 
     private runAllCells() {
@@ -138,4 +147,28 @@ export class NativeEditorCommandListener implements IDataScienceCommandListener
             }
         }
     }
+
+    private runAbove(cell: NotebookCell | undefined): void {
+        const activeEditor = this.provider.activeEditor;
+        cell = cell || this.getActiveCell(); // When called from command palette, we don't have a cell as the first argument.
+        if (activeEditor && cell) {
+            activeEditor.runAbove(cell);
+        }
+    }
+    private getActiveCell() {
+        const document = this.notebook.activeNotebookEditor?.document;
+        const selection = this.notebook.activeNotebookEditor?.selections;
+        if (!selection || !document) {
+            return;
+        }
+        const cells = document.getCells(selection[0]);
+        return cells.length ? cells[0] : undefined;
+    }
+    private runCellAndBelow(cell: NotebookCell | undefined): void {
+        const activeEditor = this.provider.activeEditor;
+        cell = cell || this.getActiveCell(); // When called from command palette, we don't have a cell as the first argument.
+        if (activeEditor && cell) {
+            activeEditor.runCellAndBelow(cell);
+        }
+    }
 }

src/client/datascience/notebook/notebookEditor.ts

@@ -7,6 +7,7 @@ import {
     ConfigurationTarget,
     Event,
     EventEmitter,
+    NotebookCell,
     NotebookCellKind,
     NotebookRange,
     NotebookDocument,
@@ -288,6 +289,24 @@ export class NotebookEditor implements INotebookEditor {
         this._closed.fire(this);
     }
 
+    public runAbove(cell: NotebookCell | undefined): void {
+        if (cell && cell.index > 0) {
+            void this.commandManager.executeCommand(
+                'notebook.cell.execute',
+                { start: 0, end: cell.index },
+                cell.notebook.uri
+            );
+        }
+    }
+    public runCellAndBelow(cell: NotebookCell | undefined): void {
+        if (cell && cell.index >= 0) {
+            void this.commandManager.executeCommand(
+                'notebook.cell.execute',
+                { start: cell.index, end: cell.notebook.cellCount },
+                cell.notebook.uri
+            );
+        }
+    }
     private onClosedDocument(e?: NotebookDocument) {
         if (this.document === e) {
             this._closed.fire(this);

src/client/datascience/types.ts

@@ -620,6 +620,8 @@ export interface INotebookEditor extends Disposable, IInteractiveBase {
     interruptKernel(): Promise<void>;
     restartKernel(): Promise<void>;
     syncAllCells(): Promise<void>;
+    runAbove(cell: NotebookCell | undefined): void;
+    runCellAndBelow(cell: NotebookCell | undefined): void;
 }
 
 export const INotebookExtensibility = Symbol('INotebookExtensibility');

src/test/datascience/notebook/notebookEditor.vscode.test.ts

@@ -4,10 +4,12 @@
 'use strict';
 
 import { assert } from 'chai';
+import { NotebookCellExecutionState } from 'vscode';
 import { ICommandManager, IVSCodeNotebook } from '../../../client/common/application/types';
 import { traceInfo } from '../../../client/common/logger';
 import { IDisposable } from '../../../client/common/types';
 import { Commands } from '../../../client/datascience/constants';
+import { hasErrorOutput, NotebookCellStateTracker } from '../../../client/datascience/notebook/helpers/helpers';
 import { IExtensionTestApi, waitForCondition } from '../../common';
 import { closeActiveWindows, initialize } from '../../initialize';
 import {
@@ -84,4 +86,60 @@ suite('Notebook Editor tests', function () {
             'Outputs were not collapsed'
         );
     });
+
+    test('Run cells above', async function () {
+        return this.skip();
+        // add some cells
+        await insertCodeCell('print("0")', { index: 0 });
+        await insertCodeCell('print("1")', { index: 1 });
+        await insertCodeCell('print("2")', { index: 2 });
+
+        // select second cell
+        await selectCell(vscodeNotebook.activeNotebookEditor?.document!, 1, 1);
+
+        // run command
+        await commandManager.executeCommand(
+            Commands.NativeNotebookRunAllCellsAbove,
+            vscodeNotebook.activeNotebookEditor?.document.cellAt(1)!
+        );
+
+        const firstCell = vscodeNotebook.activeNotebookEditor?.document.cellAt(0)!;
+        await waitForExecutionCompletedSuccessfully(firstCell);
+        const thirdCell = vscodeNotebook.activeNotebookEditor?.document.getCells()![2]!;
+
+        // The first cell should have a runState of Success
+        assert.strictEqual(NotebookCellStateTracker.getCellState(firstCell), NotebookCellExecutionState.Idle);
+        assert.isFalse(hasErrorOutput(firstCell.outputs));
+
+        // The third cell should have an undefined runState
+        assert.strictEqual(NotebookCellStateTracker.getCellState(thirdCell), undefined);
+    });
+
+    test('Run cells below', async function () {
+        return this.skip();
+        // add some cells
+        await insertCodeCell('print("0")', { index: 0 });
+        await insertCodeCell('print("1")', { index: 1 });
+        await insertCodeCell('print("2")', { index: 2 });
+
+        // select second cell
+        await selectCell(vscodeNotebook.activeNotebookEditor?.document!, 1, 1);
+
+        // run command
+        await commandManager.executeCommand(
+            Commands.NativeNotebookRunCellAndAllBelow,
+            vscodeNotebook.activeNotebookEditor?.document.cellAt(1)!
+        );
+
+        const firstCell = vscodeNotebook.activeNotebookEditor?.document.cellAt(0)!;
+        const thirdCell = vscodeNotebook.activeNotebookEditor?.document.getCells()![2]!;
+        await waitForExecutionCompletedSuccessfully(thirdCell);
+
+        // The first cell should have an undefined runState
+        assert.strictEqual(NotebookCellStateTracker.getCellState(firstCell), undefined);
+
+        // The third cell should have a runState of Success
+        assert.strictEqual(NotebookCellStateTracker.getCellState(thirdCell), NotebookCellExecutionState.Idle);
+        assert.isFalse(hasErrorOutput(thirdCell.outputs));
+    });
 });