maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

delete cell handles multi select.

Browse source
This commit is contained in:
rebornix 2021-03-16 11:15:51 -07:00
parent b3e7d37b8d
commit 99597e3974
No known key found for this signature in database
GPG key ID: 181FC90D15393C20
4 changed files with 80 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts
View file

@ -305,9 +305,13 @@ registerAction2(class extends NotebookCellAction {
viewModel.notebookDocument.applyEdits([{
editType: CellEditType.Replace, index: containingSelection.start, count: containingSelection.end - containingSelection.start, cells: []
}], true, { kind: SelectionStateType.Index, focus: viewModel.getFocus(), selections: viewModel.getSelections() }, () => ({
kind: SelectionStateType.Index, focus: { start: containingSelection.start, end: containingSelection.start + 1 }, selections: finalSelections
}), undefined);
}], true, { kind: SelectionStateType.Index, focus: viewModel.getFocus(), selections: viewModel.getSelections() }, () => {
const newFocusCellIdx = containingSelection.start < context.notebookEditor.viewModel.notebookDocument.length ? containingSelection.start : context.notebookEditor.viewModel.notebookDocument.length - 1;
return {
kind: SelectionStateType.Index, focus: { start: newFocusCellIdx, end: newFocusCellIdx + 1 }, selections: finalSelections
};
}, undefined);
notebookService.setToCopy(cellTextModels, true);
} else {
viewModel.deleteCell(viewModel.getCellIndex(context.cell), true);

73
src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
View file

@ -21,7 +21,7 @@ import { IQuickInputService, IQuickPickItem, QuickPickInput } from 'vs/platform/
import { CATEGORIES } from 'vs/workbench/common/actions';
import { BaseCellRenderTemplate, CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, EXPAND_CELL_CONTENT_COMMAND_ID, getNotebookEditorFromEditorPane, IActiveNotebookEditor, ICellViewModel, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RUN_STATE, NOTEBOOK_CELL_TYPE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_EXECUTING_NOTEBOOK, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_OUTPUT_FOCUSED } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
import { CellEditType, CellKind, ICellEditOperation, ICellRange, INotebookDocumentFilter, isDocumentExcludePattern, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, TransientMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { CellEditType, CellKind, ICellEditOperation, ICellRange, INotebookDocumentFilter, isDocumentExcludePattern, NotebookCellMetadata, NotebookCellRunState, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, SelectionStateType, TransientMetadata } 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';
@ -1011,15 +1011,72 @@ registerAction2(class extends NotebookCellAction {
}
async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext) {
const index = context.notebookEditor.viewModel.getCellIndex(context.cell);
const result = await context.notebookEditor.deleteNotebookCell(context.cell);
const viewModel = context.notebookEditor.viewModel;
if (!viewModel || !viewModel.metadata.editable) {
return;
}
if (result) {
// deletion succeeds, move focus to the next cell
const nextCellIdx = index < context.notebookEditor.viewModel.length ? index : context.notebookEditor.viewModel.length - 1;
if (nextCellIdx >= 0) {
context.notebookEditor.focusNotebookCell(context.notebookEditor.viewModel.viewCells[nextCellIdx], 'container');
const selections = viewModel.getSelections();
const targetCellIndex = viewModel.getCellIndex(context.cell);
const containingSelection = selections.find(selection => selection.start <= targetCellIndex && targetCellIndex < selection.end);
if (containingSelection) {
let finalSelections: ICellRange[] = [];
const delta = containingSelection.end - containingSelection.start;
for (let i = 0; i < selections.length; i++) {
const selection = selections[i];
if (selection.end <= targetCellIndex) {
finalSelections.push(selection);
} else if (selection.start > targetCellIndex) {
finalSelections.push({ start: selection.start - delta, end: selection.end - delta });
} else {
finalSelections.push({ start: containingSelection.start, end: containingSelection.start + 1 });
}
}
viewModel.notebookDocument.applyEdits([{
editType: CellEditType.Replace, index: containingSelection.start, count: containingSelection.end - containingSelection.start, cells: []
}], true, { kind: SelectionStateType.Index, focus: viewModel.getFocus(), selections: viewModel.getSelections() }, () => {
const newFocusCellIdx = containingSelection.start < context.notebookEditor.viewModel.notebookDocument.length ? containingSelection.start : context.notebookEditor.viewModel.notebookDocument.length - 1;
return {
kind: SelectionStateType.Index, focus: { start: newFocusCellIdx, end: newFocusCellIdx + 1 }, selections: finalSelections
};
}, undefined);
} else {
let finalSelections: ICellRange[] = [];
for (let i = 0; i < selections.length; i++) {
const selection = selections[i];
if (selection.end <= targetCellIndex) {
finalSelections.push(selection);
} else if (selection.start > targetCellIndex) {
finalSelections.push({ start: selection.start - 1, end: selection.end - 1 });
} else {
finalSelections.push({ start: targetCellIndex, end: targetCellIndex + 1 });
}
}
viewModel.notebookDocument.applyEdits([{
editType: CellEditType.Replace, index: targetCellIndex, count: 1, cells: []
}], true, { kind: SelectionStateType.Index, focus: viewModel.getFocus(), selections: viewModel.getSelections() }, () => {
const newFocusCellIdx = targetCellIndex < context.notebookEditor.viewModel.notebookDocument.length ? targetCellIndex : context.notebookEditor.viewModel.notebookDocument.length - 1;
return {
kind: SelectionStateType.Index, focus: { start: newFocusCellIdx, end: newFocusCellIdx + 1 }, selections: finalSelections
};
}, undefined);
// const result = await context.notebookEditor.deleteNotebookCell(context.cell);
// if (result) {
// // deletion succeeds, move focus to the next cell
// const nextCellIdx = targetCellIndex < context.notebookEditor.viewModel.length ? targetCellIndex : context.notebookEditor.viewModel.length - 1;
// if (nextCellIdx >= 0) {
// context.notebookEditor.focusNotebookCell(context.notebookEditor.viewModel.viewCells[nextCellIdx], 'container');
// }
// }
}
}
});

4
src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
View file

@ -196,6 +196,10 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
const top = this.getViewScrollTop();
const bottom = this.getViewScrollBottom();
if (top >= bottom) {
return;
}
const topViewIndex = clamp(this.view.indexAt(top), 0, this.view.length - 1);
const topElement = this.view.element(topViewIndex);
const topModelIndex = this._viewModel!.getCellIndex(topElement);

4
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
View file

@ -219,6 +219,10 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
private _operationManager: NotebookOperationManager;
private _eventEmitter: DelayedEmitter;
get length() {
return this._cells.length;
}
get cells(): readonly NotebookCellTextModel[] {
return this._cells;
}