Clean up duplicate menu registration in cell run toolbar (microsoft#161124)

Author: roblourens

src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.ts

@@ -31,7 +31,6 @@ export class BetweenCellToolbar extends CellPart {
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
-
 		this._betweenCellToolbar = this._register(instantiationService.createInstance(MenuWorkbenchToolBar, this._bottomCellToolbarContainer, this._notebookEditor.creationOptions.menuIds.cellInsertToolbar, {
 			actionViewItemProvider: action => {
 				if (action instanceof MenuItemAction) {

src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.ts

@@ -26,6 +26,9 @@ import { NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CEL
 export class RunToolbar extends CellPart {
 	private toolbar!: WorkbenchToolBar;
 
+	private primaryMenu: IMenu;
+	private secondaryMenu: IMenu;
+
 	constructor(
 		readonly notebookEditor: INotebookEditorDelegate,
 		readonly contextKeyService: IContextKeyService,
@@ -38,18 +41,17 @@ export class RunToolbar extends CellPart {
 	) {
 		super();
 
-		const menu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecutePrimary!, contextKeyService));
-		const secondaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecuteToolbar, contextKeyService));
-		// TODO@roblourens what does secondaryMenu actually do? where/when is it rendered?
+		this.primaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecutePrimary!, contextKeyService));
+		this.secondaryMenu = this._register(menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecuteToolbar, contextKeyService));
 		this.createRunCellToolbar(runButtonContainer, cellContainer, contextKeyService);
 		const updateActions = () => {
-			const actions = this.getCellToolbarActions(menu);
+			const actions = this.getCellToolbarActions(this.primaryMenu);
 			const primary = actions.primary[0]; // Only allow one primary action
 			this.toolbar.setActions(primary ? [primary] : []);
 		};
 		updateActions();
-		this._register(menu.onDidChange(updateActions));
-		this._register(secondaryMenu.onDidChange(updateActions));
+		this._register(this.primaryMenu.onDidChange(updateActions));
+		this._register(this.secondaryMenu.onDidChange(updateActions));
 		this._register(this.notebookEditor.notebookOptions.onDidChangeOptions(updateActions));
 	}
 
@@ -86,14 +88,12 @@ export class RunToolbar extends CellPart {
 			actionViewItemProvider: _action => {
 				actionViewItemDisposables.clear();
 
-				const primaryMenu = actionViewItemDisposables.add(this.menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecutePrimary!, contextKeyService));
-				const primary = this.getCellToolbarActions(primaryMenu).primary[0];
+				const primary = this.getCellToolbarActions(this.primaryMenu).primary[0];
 				if (!(primary instanceof MenuItemAction)) {
 					return undefined;
 				}
 
-				const menu = actionViewItemDisposables.add(this.menuService.createMenu(this.notebookEditor.creationOptions.menuIds.cellExecuteToolbar, contextKeyService));
-				const secondary = this.getCellToolbarActions(menu).secondary;
+				const secondary = this.getCellToolbarActions(this.secondaryMenu).secondary;
 				if (!secondary.length) {
 					return undefined;
 				}