fix microsoft#96070

rebornix · rebornix · commit 08f8499e93f3 · 2020-04-24T13:26:27.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -394,11 +394,23 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
 		if (height) {
 			const elementDisposables = templateData.elementDisposables;
 
+			// render toolbar first
+			const contextKeyService = this.contextKeyService.createScoped(templateData.container);
+			this.setupCellToolbarActions(contextKeyService, templateData, elementDisposables);
+
+			const toolbarContext = <INotebookCellActionContext>{
+				cell: element,
+				notebookEditor: this.notebookEditor,
+				$mid: 12
+			};
+			templateData.toolbar.context = toolbarContext;
+
+			this.setupBetweenCellToolbarActions(element, templateData, elementDisposables, toolbarContext);
+
 			const markdownCell = new StatefullMarkdownCell(this.notebookEditor, element, templateData, this.editorOptions.value, this.instantiationService);
 			elementDisposables.add(this.editorOptions.onDidChange(newValue => markdownCell.updateEditorOptions(newValue)));
 			elementDisposables.add(markdownCell);
 
-			const contextKeyService = this.contextKeyService.createScoped(templateData.container);
 			NOTEBOOK_CELL_TYPE.bindTo(contextKeyService).set('markdown');
 			NOTEBOOK_VIEW_TYPE.bindTo(contextKeyService).set(element.viewType);
 			const metadata = element.getEvaluatedMetadata(this.notebookEditor.viewModel!.notebookDocument.metadata);
@@ -424,16 +436,6 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
 				}
 			}));
 
-			this.setupCellToolbarActions(contextKeyService, templateData, elementDisposables);
-
-			const toolbarContext = <INotebookCellActionContext>{
-				cell: element,
-				notebookEditor: this.notebookEditor,
-				$mid: 12
-			};
-			templateData.toolbar.context = toolbarContext;
-
-			this.setupBetweenCellToolbarActions(element, templateData, elementDisposables, toolbarContext);
 			element.totalHeight = height;
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/markdownCell.ts
@@ -149,6 +149,10 @@ export class StatefullMarkdownCell extends Disposable {
 							this.markdownContainer.appendChild(renderedHTML);
 						}
 					}));
+
+					const clientHeight = templateData.container.clientHeight;
+					this.viewCell.totalHeight = clientHeight;
+					notebookEditor.layoutNotebookCell(viewCell, clientHeight);
 				}
 			}
 		};

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,10 @@ export class StatefullMarkdownCell extends Disposable {`
`149`	`149`	`this.markdownContainer.appendChild(renderedHTML);`
`150`	`150`	`}`
`151`	`151`	`}));`
	`152`	`+`
	`153`	`+ const clientHeight = templateData.container.clientHeight;`
	`154`	`+ this.viewCell.totalHeight = clientHeight;`
	`155`	`+ notebookEditor.layoutNotebookCell(viewCell, clientHeight);`
`152`	`156`	`}`
`153`	`157`	`}`
`154`	`158`	`};`