More ways to render markdown cells - when cell/notebook is executed, and new action to force it

roblourens · roblourens · commit fd3cebb09534 · 2020-05-21T11:44:46.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
@@ -33,6 +33,7 @@ const NOTEBOOK_UNDO = 'notebook.undo';
 const NOTEBOOK_CURSOR_UP = 'notebook.cursorUp';
 const NOTEBOOK_CURSOR_DOWN = 'notebook.cursorDown';
 const CLEAR_ALL_CELLS_OUTPUTS_COMMAND_ID = 'notebook.clearAllCellsOutputs';
+const RENDER_ALL_MARKDOWN_CELLS = 'notebook.renderAllMarkdownCells';
 
 // Cell Commands
 const INSERT_CODE_CELL_ABOVE_COMMAND_ID = 'notebook.cell.insertCodeCellAbove';
@@ -261,6 +262,22 @@ registerAction2(class extends NotebookAction {
 	}
 });
 
+registerAction2(class extends NotebookAction {
+	constructor() {
+		super({
+			id: RENDER_ALL_MARKDOWN_CELLS,
+			title: localize('notebookActions.renderMarkdown', "Render All Markdown Cells"),
+			category: NOTEBOOK_ACTIONS_CATEGORY,
+			precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
+			f1: true
+		});
+	}
+
+	async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void> {
+		renderAllMarkdownCells(context);
+	}
+});
+
 registerAction2(class extends NotebookAction {
 	constructor() {
 		super({
@@ -273,10 +290,19 @@ registerAction2(class extends NotebookAction {
 	}
 
 	async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise<void> {
+		renderAllMarkdownCells(context);
 		return context.notebookEditor.executeNotebook();
 	}
 });
 
+function renderAllMarkdownCells(context: INotebookCellActionContext): void {
+	context.notebookEditor.viewModel!.viewCells.forEach(cell => {
+		if (cell.cellKind === CellKind.Markdown) {
+			cell.editState = CellEditState.Preview;
+		}
+	});
+}
+
 registerAction2(class extends NotebookAction {
 	constructor() {
 		super({
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -1130,6 +1130,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 	}
 
 	async executeNotebookCell(cell: ICellViewModel): Promise<void> {
+		if (cell.cellKind === CellKind.Markdown) {
+			cell.editState = CellEditState.Preview;
+			return;
+		}
+
 		if (!cell.getEvaluatedMetadata(this.notebookViewModel!.metadata).runnable) {
 			return;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1130,6 +1130,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor`
`1130`	`1130`	`}`
`1131`	`1131`
`1132`	`1132`	`async executeNotebookCell(cell: ICellViewModel): Promise<void> {`
	`1133`	`+ if (cell.cellKind === CellKind.Markdown) {`
	`1134`	`+ cell.editState = CellEditState.Preview;`
	`1135`	`+ return;`
	`1136`	`+ }`
	`1137`	`+`
`1133`	`1138`	`if (!cell.getEvaluatedMetadata(this.notebookViewModel!.metadata).runnable) {`
`1134`	`1139`	`return;`
`1135`	`1140`	`}`