Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-23 07:16:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

support cell range in notebook.cell.execute command

Browse Source
This commit is contained in:
rebornix
2020-09-18 11:36:33 -07:00
parent 6932306e4d
commit 26b00a394e
1 changed files with 102 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
+102 -12
View File
@@ -20,7 +20,7 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
import { BaseCellRenderTemplate, CellEditState, CellFocusMode, ICellViewModel, INotebookEditor, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_RUNNABLE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, EXPAND_CELL_CONTENT_COMMAND_ID, NOTEBOOK_CELL_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
import { CellEditType, CellKind, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BOUNDARY } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { CellEditType, CellKind, ICellRange, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BOUNDARY } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -167,28 +167,36 @@ abstract class NotebookAction extends Action2 {
}
}
abstract class NotebookCellAction extends NotebookAction {
abstract class NotebookCellAction<T = INotebookCellActionContext> extends NotebookAction {
protected isCellActionContext(context?: unknown): context is INotebookCellActionContext {
return !!context && !!(context as INotebookCellActionContext).notebookEditor && !!(context as INotebookCellActionContext).cell;
}
protected getCellContextFromArgs(accessor: ServicesAccessor, context?: T): INotebookCellActionContext | undefined {
return undefined;
}
async run(accessor: ServicesAccessor, context?: INotebookCellActionContext): Promise<void> {
if (!this.isCellActionContext(context)) {
const activeEditorContext = this.getActiveEditorContext(accessor);
if (this.isCellActionContext(activeEditorContext)) {
context = activeEditorContext;
} else {
return;
}
if (this.isCellActionContext(context)) {
return this.runWithContext(accessor, context);
}
this.runWithContext(accessor, context);
const contextFromArgs = this.getCellContextFromArgs(accessor, context);
if (contextFromArgs) {
return this.runWithContext(accessor, contextFromArgs);
}
const activeEditorContext = this.getActiveEditorContext(accessor);
if (this.isCellActionContext(activeEditorContext)) {
return this.runWithContext(accessor, activeEditorContext);
}
}
abstract runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void>;
}
registerAction2(class extends NotebookCellAction {
registerAction2(class extends NotebookCellAction<ICellRange> {
constructor() {
super({
id: EXECUTE_CELL_COMMAND_ID,
@@ -201,24 +209,106 @@ registerAction2(class extends NotebookCellAction {
},
weight: EDITOR_WIDGET_ACTION_WEIGHT
},
description: {
description: localize('notebookActions.execute', "Execute Cell"),
args: [
{
name: 'range',
description: 'The cell range',
schema: {
'type': 'object',
'required': ['start', 'end'],
'properties': {
'start': {
'type': 'number'
},
'end': {
'type': 'number'
}
}
}
}
]
},
icon: { id: 'codicon/play' },
});
}
getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined {
if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) {
return;
}
const activeEditorContext = this.getActiveEditorContext(accessor);
if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) {
return;
}
const cells = activeEditorContext.notebookEditor.viewModel.viewCells;
// TODO@rebornix, support multiple cells
return {
notebookEditor: activeEditorContext.notebookEditor,
cell: cells[context.start]
};
}
async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void> {
return runCell(accessor, context);
}
});
registerAction2(class extends NotebookCellAction {
registerAction2(class extends NotebookCellAction<ICellRange> {
constructor() {
super({
id: CANCEL_CELL_COMMAND_ID,
title: localize('notebookActions.cancel', "Stop Cell Execution"),
icon: { id: 'codicon/primitive-square' },
description: {
description: localize('notebookActions.execute', "Execute Cell"),
args: [
{
name: 'range',
description: 'The cell range',
schema: {
'type': 'object',
'required': ['start', 'end'],
'properties': {
'start': {
'type': 'number'
},
'end': {
'type': 'number'
}
}
}
}
]
},
});
}
getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange): INotebookCellActionContext | undefined {
if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) {
return;
}
const activeEditorContext = this.getActiveEditorContext(accessor);
if (!activeEditorContext || !activeEditorContext.notebookEditor.viewModel || context.start >= activeEditorContext.notebookEditor.viewModel.viewCells.length) {
return;
}
const cells = activeEditorContext.notebookEditor.viewModel.viewCells;
// TODO@rebornix, support multiple cells
return {
notebookEditor: activeEditorContext.notebookEditor,
cell: cells[context.start]
};
}
async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void> {
return context.notebookEditor.cancelNotebookCellExecution(context.cell);
}