joh/issue154804 (microsoft#154909)

* add action to reset menu hidden states, add actions.contribution file for service and command registration

* some 💄

Author: jrieken

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

@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IMenuService, registerAction2 } from 'vs/platform/actions/common/actions';
+import { MenuHiddenStatesReset } from 'vs/platform/actions/common/menuResetAction';
+import { MenuService } from 'vs/platform/actions/common/menuService';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+
+
+registerSingleton(IMenuService, MenuService, true);
+
+registerAction2(MenuHiddenStatesReset);

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

@@ -196,7 +196,18 @@ export interface IMenuService {
 
 	readonly _serviceBrand: undefined;
 
+	/**
+	 * Create a new menu for the given menu identifier. A menu sends events when it's entries
+	 * have changed (placement, enablement, checked-state). By default it does not send events for
+	 * submenu entries. That is more expensive and must be explicitly enabled with the
+	 * `emitEventsForSubmenuChanges` flag.
+	 */
 	createMenu(id: MenuId, contextKeyService: IContextKeyService, options?: IMenuCreateOptions): IMenu;
+
+	/**
+	 * Reset **all** menu item hidden states.
+	 */
+	resetHiddenStates(): void;
 }
 
 export type ICommandsMap = Map<string, ICommandAction>;
@@ -355,13 +366,13 @@ export class SubmenuItemAction extends SubmenuAction {
 
 export class MenuItemActionManageActions {
 	constructor(
-		private readonly _hideThis: IAction,
-		private readonly _toggleAny: IAction[][],
+		readonly hideThis: IAction,
+		readonly toggleAny: readonly IAction[][],
 	) { }
 
 	asList(): IAction[] {
-		let result: IAction[] = [this._hideThis];
-		for (const n of this._toggleAny) {
+		let result: IAction[] = [this.hideThis];
+		for (const n of this.toggleAny) {
 			result.push(new Separator());
 			result = result.concat(n);
 		}

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

@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { Action2, IMenuService } from 'vs/platform/actions/common/actions';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vs/platform/log/common/log';
+
+export class MenuHiddenStatesReset extends Action2 {
+
+	constructor() {
+		super({
+			id: 'menu.resetHiddenStates',
+			title: {
+				value: localize('title', 'Reset Hidden Menus'),
+				original: 'Reset Hidden Menus'
+			},
+			category: localize('cat', 'View'),
+			f1: true
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		accessor.get(IMenuService).resetHiddenStates();
+		accessor.get(ILogService).info('did RESET all menu hidden states');
+	}
+}

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

@@ -28,15 +28,13 @@ export class MenuService implements IMenuService {
 		this._hiddenStates = new PersistedMenuHideState(storageService);
 	}
 
-	/**
-	 * Create a new menu for the given menu identifier. A menu sends events when it's entries
-	 * have changed (placement, enablement, checked-state). By default it does not send events for
-	 * submenu entries. That is more expensive and must be explicitly enabled with the
-	 * `emitEventsForSubmenuChanges` flag.
-	 */
 	createMenu(id: MenuId, contextKeyService: IContextKeyService, options?: IMenuCreateOptions): IMenu {
 		return new Menu(id, this._hiddenStates, { emitEventsForSubmenuChanges: false, eventDebounceDelay: 50, ...options }, this._commandService, contextKeyService, this);
 	}
+
+	resetHiddenStates(): void {
+		this._hiddenStates.reset();
+	}
 }
 
 class PersistedMenuHideState {
@@ -110,6 +108,11 @@ class PersistedMenuHideState {
 		this._persist();
 	}
 
+	reset(): void {
+		this._data = Object.create(null);
+		this._persist();
+	}
+
 	private _persist(): void {
 		try {
 			this._ignoreChangeEvent = true;
@@ -264,9 +267,8 @@ class Menu implements IMenu {
 							action.dispose();
 							action = undefined;
 						}
-						// add toggle submenu
+						// add toggle submenu - this re-creates ToggleMenuItemAction-instances for submenus but that's OK...
 						if (action) {
-							// todo@jrieken this isn't good and O(n2) because this recurses for each submenu...
 							const makeToggleCommand = (id: MenuId, action: IAction): IAction => {
 								if (action instanceof SubmenuItemAction) {
 									return new SubmenuAction(action.id, action.label, action.actions.map(a => makeToggleCommand(action.item.submenu, a)));

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -519,6 +519,10 @@ export class TestMenuService implements IMenuService {
 			getActions: () => []
 		};
 	}
+
+	resetHiddenStates(): void {
+		// nothing
+	}
 }
 
 export class TestHistoryService implements IHistoryService {

src/vs/workbench/workbench.common.main.ts

@@ -52,6 +52,7 @@ import 'vs/workbench/browser/parts/views/viewsService';
 
 //#region --- workbench services
 
+import 'vs/platform/actions/common/actions.contribution';
 import 'vs/platform/undoRedo/common/undoRedoService';
 import 'vs/workbench/services/extensions/browser/extensionUrlHandler';
 import 'vs/workbench/services/keybinding/common/keybindingEditing';
@@ -116,8 +117,6 @@ import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyServ
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 import { TextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { MenuService } from 'vs/platform/actions/common/menuService';
 import { IDownloadService } from 'vs/platform/download/common/download';
 import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { OpenerService } from 'vs/editor/browser/services/openerService';
@@ -140,7 +139,6 @@ registerSingleton(IMarkerDecorationsService, MarkerDecorationsService);
 registerSingleton(IMarkerService, MarkerService, true);
 registerSingleton(IContextKeyService, ContextKeyService);
 registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService);
-registerSingleton(IMenuService, MenuService, true);
 registerSingleton(IDownloadService, DownloadService, true);
 registerSingleton(IOpenerService, OpenerService, true);
 registerSingleton(IExtensionsProfileScannerService, ExtensionsProfileScannerService);