give menuIds to setActions, adopt for composite panes (microsoft#162317)

fixes microsoft#162003 (comment)

Author: jrieken

src/vs/platform/actions/browser/toolbar.ts

@@ -96,7 +96,7 @@ export class WorkbenchToolBar extends ToolBar {
 		}
 	}
 
-	override setActions(_primary: readonly IAction[], _secondary: readonly IAction[] = []): void {
+	override setActions(_primary: readonly IAction[], _secondary: readonly IAction[] = [], menuIds?: readonly MenuId[]): void {
 
 		this._sessionDisposables.clear();
 		const primary = _primary.slice();
@@ -170,12 +170,15 @@ export class WorkbenchToolBar extends ToolBar {
 				actions = [hideAction, new Separator(), ...toggleActions];
 
 				// add "Reset Menu" action
-				if (someAreHidden && this._options?.resetMenu) {
+				if (this._options?.resetMenu && !menuIds) {
+					menuIds = [this._options.resetMenu];
+				}
+				if (someAreHidden && menuIds) {
 					actions.push(new Separator());
 					actions.push(toAction({
 						id: 'resetThisMenu',
 						label: localize('resetThisMenu', "Reset Menu"),
-						run: () => this._menuService.resetHiddenStates(this._options!.resetMenu)
+						run: () => this._menuService.resetHiddenStates(menuIds)
 					}));
 				}
 

src/vs/platform/actions/common/actions.ts

@@ -238,7 +238,7 @@ export interface IMenuService {
 	/**
 	 * Reset the menu's hidden states.
 	 */
-	resetHiddenStates(menuId: MenuId | undefined): void;
+	resetHiddenStates(menuIds: readonly MenuId[] | undefined): void;
 }
 
 export type ICommandsMap = Map<string, ICommandAction>;

src/vs/platform/actions/common/menuService.ts

@@ -32,8 +32,8 @@ export class MenuService implements IMenuService {
 		return new MenuImpl(id, this._hiddenStates, { emitEventsForSubmenuChanges: false, eventDebounceDelay: 50, ...options }, this._commandService, contextKeyService);
 	}
 
-	resetHiddenStates(id?: MenuId): void {
-		this._hiddenStates.reset(id);
+	resetHiddenStates(ids?: MenuId[]): void {
+		this._hiddenStates.reset(ids);
 	}
 }
 
@@ -108,17 +108,19 @@ class PersistedMenuHideState {
 		this._persist();
 	}
 
-	reset(menu?: MenuId): void {
-		if (menu === undefined) {
+	reset(menus?: MenuId[]): void {
+		if (menus === undefined) {
 			// reset all
 			this._data = Object.create(null);
 			this._persist();
 		} else {
 			// reset only for a specific menu
-			if (this._data[menu.id]) {
-				delete this._data[menu.id];
-				this._persist();
+			for (const { id } of menus) {
+				if (this._data[id]) {
+					delete this._data[id];
+				}
 			}
+			this._persist();
 		}
 	}
 

src/vs/workbench/browser/composite.ts

@@ -15,6 +15,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { assertIsDefined } from 'vs/base/common/types';
 import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { MenuId } from 'vs/platform/actions/common/actions';
 
 /**
  * Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -161,6 +162,15 @@ export abstract class Composite extends Component implements IComposite {
 		super.updateStyles();
 	}
 
+
+	/**
+	 *
+	 * @returns the action runner for this composite
+	 */
+	getMenuIds(): readonly MenuId[] {
+		return [];
+	}
+
 	/**
 	 * Returns an array of actions to show in the action bar of the composite.
 	 */

src/vs/workbench/browser/panecomposite.ts

@@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri';
 import { Dimension } from 'vs/base/browser/dom';
 import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IAction, Separator } from 'vs/base/common/actions';
-import { SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { MenuId, SubmenuItemAction } from 'vs/platform/actions/common/actions';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -73,6 +73,17 @@ export abstract class PaneComposite extends Composite implements IPaneComposite
 		return this.viewPaneContainer?.menuActions?.getContextMenuActions() ?? [];
 	}
 
+	override getMenuIds(): MenuId[] {
+		const result: MenuId[] = [];
+		if (this.viewPaneContainer?.menuActions) {
+			result.push(this.viewPaneContainer.menuActions.menuId);
+			if (this.viewPaneContainer.isViewMergedWithContainer()) {
+				result.push(this.viewPaneContainer.panes[0].menuActions.menuId);
+			}
+		}
+		return result;
+	}
+
 	override getActions(): readonly IAction[] {
 		const result = [];
 		if (this.viewPaneContainer?.menuActions) {

src/vs/workbench/browser/parts/compositePart.ts

@@ -329,6 +329,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 	private collectCompositeActions(composite?: Composite): () => void {
 
 		// From Composite
+		const menuIds = composite?.getMenuIds();
 		const primaryActions: IAction[] = composite?.getActions().slice(0) || [];
 		const secondaryActions: IAction[] = composite?.getSecondaryActions().slice(0) || [];
 
@@ -337,7 +338,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		toolBar.context = this.actionsContextProvider();
 
 		// Return fn to set into toolbar
-		return () => toolBar.setActions(prepareActions(primaryActions), prepareActions(secondaryActions));
+		return () => toolBar.setActions(prepareActions(primaryActions), prepareActions(secondaryActions), menuIds);
 	}
 
 	protected getActiveComposite(): IComposite | undefined {