Don't allow deleting the last notebook cell - add a new one in its place

roblourens · roblourens · commit b99790bff71e · 2020-04-22T13:44:00.000-05:00
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/contrib/coreActions.ts
@@ -673,10 +673,13 @@ registerAction2(class extends Action2 {
 
 		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], false);
+			} else {
+				// No cells left, insert a new empty one
+				const newCell = context.notebookEditor.insertNotebookCell(undefined, context.cell.cellKind);
+				context.notebookEditor.focusNotebookCell(newCell, true);
 			}
 		}
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -150,7 +150,7 @@ export interface INotebookEditor {
 	/**
 	 * Insert a new cell around `cell`
 	 */
-	insertNotebookCell(cell: ICellViewModel, type: CellKind, direction: 'above' | 'below', initialText?: string): CellViewModel;
+	insertNotebookCell(cell: ICellViewModel | undefined, type: CellKind, direction?: 'above' | 'below', initialText?: string): CellViewModel;
 
 	/**
 	 * Delete a cell from the notebook
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -676,11 +676,13 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
 		return new Promise(resolve => { r = resolve; });
 	}
 
-	insertNotebookCell(cell: ICellViewModel, type: CellKind, direction: 'above' | 'below', initialText: string = ''): CellViewModel {
+	insertNotebookCell(cell: ICellViewModel | undefined, type: CellKind, direction: 'above' | 'below' = 'above', initialText: string = ''): CellViewModel {
 		const newLanguages = this.notebookViewModel!.languages;
 		const language = newLanguages && newLanguages.length ? newLanguages[0] : 'markdown';
-		const index = this.notebookViewModel!.getCellIndex(cell);
-		const insertIndex = direction === 'above' ? index : index + 1;
+		const index = cell ? this.notebookViewModel!.getCellIndex(cell) : 0;
+		const insertIndex = cell ?
+			(direction === 'above' ? index : index + 1) :
+			index;
 		const newCell = this.notebookViewModel!.createCell(insertIndex, initialText.split(/\r?\n/g), language, type, true);
 
 		if (type === CellKind.Markdown) {

Original file line number	Diff line number	Diff line change
`@@ -673,10 +673,13 @@ registerAction2(class extends Action2 {`
`673`	`673`
`674`	`674`	`if (result) {`
`675`	`675`	`// deletion succeeds, move focus to the next cell`
`676`		`-`
`677`	`676`	`const nextCellIdx = index < context.notebookEditor.viewModel!.length ? index : context.notebookEditor.viewModel!.length - 1;`
`678`	`677`	`if (nextCellIdx >= 0) {`
`679`	`678`	`context.notebookEditor.focusNotebookCell(context.notebookEditor.viewModel!.viewCells[nextCellIdx], false);`
	`679`	`+ } else {`
	`680`	`+ // No cells left, insert a new empty one`
	`681`	`+ const newCell = context.notebookEditor.insertNotebookCell(undefined, context.cell.cellKind);`
	`682`	`+ context.notebookEditor.focusNotebookCell(newCell, true);`
`680`	`683`	`}`
`681`	`684`	`}`
`682`	`685`	`}`