@theia/core 1.61.0 → 1.62.0

package/src/electron-browser/menu/electron-main-menu-factory.ts

@@ -17,11 +17,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { inject, injectable, postConstruct } from 'inversify';
-import { isOSX, MAIN_MENU_BAR, MenuPath, MenuNode, CommandMenuNode, CompoundMenuNode, CompoundMenuNodeRole } from '../../common';
-import { Keybinding } from '../../common/keybinding';
+import { isOSX, MAIN_MENU_BAR, MenuNode, CompoundMenuNode, Group, RenderedMenuNode, CommandMenu, AcceleratorSource, MenuPath } from '../../common';
 import { PreferenceService, CommonCommands } from '../../browser';
 import debounce = require('lodash.debounce');
-import { MAXIMIZED_CLASS } from '../../browser/shell/theia-dock-panel';
 import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
 import { ContextMatcher } from '../../browser/context-key-service';
 import { MenuDto, MenuRole } from '../../electron-common/electron-api';
@@ -51,10 +49,6 @@ export interface ElectronMenuOptions {
      * If none is provided, the global context will be used.
      */
     contextKeyService?: ContextMatcher;
-    /**
-     * The root menu path for which the menu is being built.
-     */
-    rootMenuPath: MenuPath
 }
 
 /**
@@ -71,11 +65,28 @@ export type ElectronMenuItemRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' |
     'selectNextTab' | 'selectPreviousTab' | 'mergeAllWindows' | 'clearRecentDocuments' |
     'moveTabToNewWindow' | 'windowMenu');
 
+function traverseMenuDto(items: MenuDto[], callback: (item: MenuDto) => void): void {
+    for (const item of items) {
+        callback(item);
+        if (item.submenu) {
+            traverseMenuDto(item.submenu, callback);
+        }
+    }
+}
+
+function traverseMenuModel(effectivePath: MenuPath, item: MenuNode, callback: (item: MenuNode, path: MenuPath) => void): void {
+    callback(item, effectivePath);
+    if (CompoundMenuNode.is(item)) {
+        for (const child of item.children) {
+            traverseMenuModel([...effectivePath, child.id], child, callback);
+        }
+    }
+}
+
 @injectable()
 export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
 
     protected menu?: MenuDto[];
-    protected toggledCommands: Set<string> = new Set();
 
     @inject(PreferenceService)
     protected preferencesService: PreferenceService;
@@ -94,16 +105,33 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
             this.preferencesService.onPreferenceChanged(
                 debounce(e => {
                     if (e.preferenceName === 'window.menuBarVisibility') {
-                        this.doSetMenuBar();
+                        this.setMenuBar();
                     }
                     if (this.menu) {
-                        for (const cmd of this.toggledCommands) {
-                            const menuItem = this.findMenuById(this.menu, cmd);
-                            if (menuItem && (!!menuItem.checked !== this.commandRegistry.isToggled(cmd))) {
-                                menuItem.checked = !menuItem.checked;
+                        const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR)!;
+                        const toggledMap = new Map<string, MenuDto>();
+                        traverseMenuDto(this.menu, item => {
+                            if (item.id) {
+                                toggledMap.set(item.id, item);
                             }
+                        });
+                        let anyChanged = false;
+
+                        traverseMenuModel(MAIN_MENU_BAR, menuModel, ((item, path) => {
+                            if (CommandMenu.is(item)) {
+                                const isToggled = item.isToggled(path);
+                                const menuItem = toggledMap.get(item.id);
+                                if (menuItem && isToggled !== menuItem.checked) {
+                                    anyChanged = true;
+                                    menuItem.type = isToggled ? 'checkbox' : 'normal';
+                                    menuItem.checked = isToggled;
+                                }
+                            }
+                        }));
+
+                        if (anyChanged) {
+                            window.electronTheiaCore.setMenu(this.menu);
                         }
-                        window.electronTheiaCore.setMenu(this.menu);
                     }
                 }, 10)
             );
@@ -111,50 +139,58 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
     }
 
     doSetMenuBar(): void {
-        this.menu = this.createElectronMenuBar();
-        window.electronTheiaCore.setMenu(this.menu);
+        const preference = this.preferencesService.get<string>('window.menuBarVisibility') || 'classic';
+        const shouldShowTop = !window.electronTheiaCore.isFullScreen() || preference === 'visible';
+        if (shouldShowTop) {
+            this.menu = this.createElectronMenuBar();
+            window.electronTheiaCore.setMenu(this.menu);
+            window.electronTheiaCore.setMenuBarVisible(true);
+        } else {
+            window.electronTheiaCore.setMenuBarVisible(false);
+        }
     }
 
-    createElectronMenuBar(): MenuDto[] | undefined {
-        const preference = this.preferencesService.get<string>('window.menuBarVisibility') || 'classic';
-        const maxWidget = document.getElementsByClassName(MAXIMIZED_CLASS);
-        if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
-            const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR);
-            const menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: MAIN_MENU_BAR }, false);
-            if (isOSX) {
-                menu.unshift(this.createOSXMenu());
-            }
-            return menu;
+    createElectronMenuBar(): MenuDto[] {
+        const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR)!;
+        const menu = this.fillMenuTemplate([], MAIN_MENU_BAR, menuModel, [], this.contextKeyService, { honorDisabled: false }, false);
+        if (isOSX) {
+            menu.unshift(this.createOSXMenu());
         }
-        return undefined;
+        return menu;
     }
 
-    createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher, skipSingleRootNode?: boolean): MenuDto[] {
-        const menuModel = skipSingleRootNode ? this.menuProvider.removeSingleRootNode(this.menuProvider.getMenu(menuPath), menuPath) : this.menuProvider.getMenu(menuPath);
-        return this.fillMenuTemplate([], menuModel, args, { showDisabled: true, context, rootMenuPath: menuPath, contextKeyService }, true);
+    createElectronContextMenu(menuPath: MenuPath, menu: CompoundMenuNode, contextMatcher: ContextMatcher, args?: any[],
+        context?: HTMLElement, skipSingleRootNode?: boolean): MenuDto[] {
+        return this.fillMenuTemplate([], menuPath, menu, args, contextMatcher, { showDisabled: true, context }, true);
     }
 
     protected fillMenuTemplate(parentItems: MenuDto[],
+        menuPath: MenuPath,
         menu: MenuNode,
         args: unknown[] = [],
+        contextMatcher: ContextMatcher,
         options: ElectronMenuOptions,
         skipRoot: boolean
     ): MenuDto[] {
         const showDisabled = options?.showDisabled !== false;
         const honorDisabled = options?.honorDisabled !== false;
 
-        if (CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch(options.contextKeyService ?? this.contextKeyService, menu.when, options.context)) {
-            const role = CompoundMenuNode.getRole(menu);
-            if (role === CompoundMenuNodeRole.Group && menu.id === 'inline') {
+        if (CompoundMenuNode.is(menu) && menu.children.length && menu.isVisible(menuPath, contextMatcher, options.context, ...args)) {
+            if (Group.is(menu) && menu.id === 'inline') {
                 return parentItems;
             }
-            const children = CompoundMenuNode.getFlatChildren(menu.children);
+
+            if (menu.contextKeyOverlays) {
+                const overlays = menu.contextKeyOverlays;
+                contextMatcher = this.services.contextKeyService.createOverlay(Object.keys(overlays).map(key => [key, overlays[key]]));
+            }
+            const children = menu.children;
             const myItems: MenuDto[] = [];
-            children.forEach(child => this.fillMenuTemplate(myItems, child, args, options, false));
+            children.forEach(child => this.fillMenuTemplate(myItems, [...menuPath, child.id], child, args, contextMatcher, options, false));
             if (myItems.length === 0) {
                 return parentItems;
             }
-            if (!skipRoot && role === CompoundMenuNodeRole.Submenu) {
+            if (!skipRoot && RenderedMenuNode.is(menu)) {
                 parentItems.push({ label: menu.label, submenu: myItems });
             } else {
                 if (parentItems.length && parentItems[parentItems.length - 1].type !== 'separator') {
@@ -163,54 +199,46 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
                 parentItems.push(...myItems);
                 parentItems.push({ type: 'separator' });
             }
-        } else if (menu.command) {
-            const node = menu.altNode && this.context.altPressed ? menu.altNode : (menu as MenuNode & CommandMenuNode);
-            const commandId = node.command;
-
-            // That is only a sanity check at application startup.
-            if (!this.commandRegistry.getCommand(commandId)) {
-                console.debug(`Skipping menu item with missing command: "${commandId}".`);
-                return parentItems;
-            }
-
-            if (
-                !this.menuCommandExecutor.isVisible(options.rootMenuPath, commandId, ...args)
-                || !this.undefinedOrMatch(options.contextKeyService ?? this.contextKeyService, node.when, options.context)) {
+        } else if (CommandMenu.is(menu)) {
+            if (!menu.isVisible(menuPath, contextMatcher, options.context, ...args)) {
                 return parentItems;
             }
 
             // We should omit rendering context-menu items which are disabled.
-            if (!showDisabled && !this.menuCommandExecutor.isEnabled(options.rootMenuPath, commandId, ...args)) {
+            if (!showDisabled && !menu.isEnabled(menuPath, ...args)) {
                 return parentItems;
             }
 
-            const bindings = this.keybindingRegistry.getKeybindingsForCommand(commandId);
-
-            const accelerator = bindings[0] && this.acceleratorFor(bindings[0]);
+            const accelerator = AcceleratorSource.is(menu) ? menu.getAccelerator(options.context).join(' ') : undefined;
 
             const menuItem: MenuDto = {
-                id: node.id,
-                label: node.label,
-                type: this.commandRegistry.getToggledHandler(commandId, ...args) ? 'checkbox' : 'normal',
-                checked: this.commandRegistry.isToggled(commandId, ...args),
-                enabled: !honorDisabled || this.commandRegistry.isEnabled(commandId, ...args), // see https://github.com/eclipse-theia/theia/issues/446
+                id: menu.id,
+                label: menu.label,
+                type: menu.isToggled(menuPath, ...args) ? 'checkbox' : 'normal',
+                checked: menu.isToggled(menuPath, ...args),
+                enabled: !honorDisabled || menu.isEnabled(menuPath, ...args), // see https://github.com/eclipse-theia/theia/issues/446
                 visible: true,
                 accelerator,
-                execute: () => this.execute(commandId, args, options.rootMenuPath)
+                execute: async () => {
+                    const wasToggled = menuItem.checked;
+                    await menu.run(menuPath, ...args);
+                    const isToggled = menu.isToggled(menuPath, ...args);
+                    if (isToggled !== wasToggled) {
+                        menuItem.type = isToggled ? 'checkbox' : 'normal';
+                        menuItem.checked = isToggled;
+                        window.electronTheiaCore.setMenu(this.menu);
+                    }
+                }
             };
 
             if (isOSX) {
-                const role = this.roleFor(node.id);
+                const role = this.roleFor(menu.id);
                 if (role) {
                     menuItem.role = role;
                     delete menuItem.execute;
                 }
             }
             parentItems.push(menuItem);
-
-            if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
-                this.toggledCommands.add(commandId);
-            }
         }
         return parentItems;
     }
@@ -222,24 +250,6 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         return true;
     }
 
-    /**
-     * Return a user visible representation of a keybinding.
-     */
-    protected acceleratorFor(keybinding: Keybinding): string {
-        const bindingKeySequence = this.keybindingRegistry.resolveKeybinding(keybinding);
-        // FIXME see https://github.com/electron/electron/issues/11740
-        // Key Sequences can't be represented properly in the electron menu.
-        //
-        // We can do what VS Code does, and append the chords as a suffix to the menu label.
-        // https://github.com/eclipse-theia/theia/issues/1199#issuecomment-430909480
-        if (bindingKeySequence.length > 1) {
-            return '';
-        }
-
-        const keyCode = bindingKeySequence[0];
-        return this.keybindingRegistry.acceleratorForKeyCode(keyCode, '+', true);
-    }
-
     protected roleFor(id: string): MenuRole | undefined {
         let role: MenuRole | undefined;
         switch (id) {
@@ -267,40 +277,6 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         return role;
     }
 
-    protected async execute(cmd: string, args: any[], menuPath: MenuPath): Promise<void> {
-        try {
-            // This is workaround for https://github.com/eclipse-theia/theia/issues/446.
-            // Electron menus do not update based on the `isEnabled`, `isVisible` property of the command.
-            // We need to check if we can execute it.
-            if (this.menuCommandExecutor.isEnabled(menuPath, cmd, ...args)) {
-                await this.menuCommandExecutor.executeCommand(menuPath, cmd, ...args);
-                if (this.menu && this.menuCommandExecutor.isVisible(menuPath, cmd, ...args)) {
-                    const item = this.findMenuById(this.menu, cmd);
-                    if (item) {
-                        item.checked = this.menuCommandExecutor.isToggled(menuPath, cmd, ...args);
-                        window.electronTheiaCore.setMenu(this.menu);
-                    }
-                }
-            }
-        } catch {
-            // no-op
-        }
-    }
-    findMenuById(items: MenuDto[], id: string): MenuDto | undefined {
-        for (const item of items) {
-            if (item.id === id) {
-                return item;
-            }
-            if (item.submenu) {
-                const found = this.findMenuById(item.submenu, id);
-                if (found) {
-                    return found;
-                }
-            }
-        }
-        return undefined;
-    }
-
     protected createOSXMenu(): MenuDto {
         return {
             label: 'Theia',

package/src/electron-browser/menu/electron-menu-contribution.ts

@@ -120,10 +120,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
             }
         };
         onStateChange = this.stateService.onStateChanged(stateServiceListener);
-        this.shell.mainPanel.onDidToggleMaximized(() => {
-            this.handleToggleMaximized();
-        });
-        this.shell.bottomPanel.onDidToggleMaximized(() => {
+        this.shell.onDidToggleMaximized(() => {
             this.handleToggleMaximized();
         });
         this.attachMenuBarVisibilityListener();

package/src/electron-browser/menu/electron-menu-module.ts

@@ -15,14 +15,17 @@
 // *****************************************************************************
 
 import { ContainerModule } from 'inversify';
-import { CommandContribution, MenuContribution } from '../../common';
+import { CommandContribution, MenuContribution, MenuNodeFactory } from '../../common';
 import { FrontendApplicationContribution, ContextMenuRenderer, KeybindingContribution, KeybindingContext } from '../../browser';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
 import { ElectronContextMenuRenderer, ElectronTextInputContextMenuContribution } from './electron-context-menu-renderer';
 import { CustomTitleWidget, CustomTitleWidgetFactory, ElectronMenuContribution } from './electron-menu-contribution';
+import { BrowserMenuNodeFactory } from '../../browser/menu/browser-menu-node-factory';
+import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
 
 export default new ContainerModule(bind => {
     bind(ElectronMainMenuFactory).toSelf().inSingletonScope();
+    bind(BrowserMainMenuFactory).toService(ElectronMainMenuFactory);
     bind(ContextMenuRenderer).to(ElectronContextMenuRenderer).inSingletonScope();
     bind(KeybindingContext).toConstantValue({
         id: 'theia.context',
@@ -37,4 +40,6 @@ export default new ContainerModule(bind => {
     bind(CustomTitleWidgetFactory).toFactory(context => () => context.container.get(CustomTitleWidget));
     bind(FrontendApplicationContribution).to(ElectronTextInputContextMenuContribution).inSingletonScope();
     bind(MenuContribution).to(ElectronTextInputContextMenuContribution).inSingletonScope();
+    bind(BrowserMenuNodeFactory).toSelf().inSingletonScope();
+    bind(MenuNodeFactory).toService(BrowserMenuNodeFactory);
 });

package/src/electron-browser/window/electron-secondary-window-service.ts

@@ -17,6 +17,8 @@
 import { injectable } from 'inversify';
 import { DefaultSecondaryWindowService } from '../../browser/window/default-secondary-window-service';
 import { ApplicationShell, ExtractableWidget } from '../../browser';
+import { ElectronWindowService } from './electron-window-service';
+import { Deferred, timeout } from '../../common/promise-util';
 
 @injectable()
 export class ElectronSecondaryWindowService extends DefaultSecondaryWindowService {
@@ -24,6 +26,26 @@ export class ElectronSecondaryWindowService extends DefaultSecondaryWindowServic
         window.electronTheiaCore.focusWindow(win.name);
     }
 
+    override registerShutdownListeners(): void {
+        // Close all open windows when the main window is closed.
+        (this.windowService as ElectronWindowService).onWillShutDown(() => {
+            const promises = [];
+            // Iterate backwards because calling window.close might remove the window from the array
+            for (let i = this.secondaryWindows.length - 1; i >= 0; i--) {
+                const windowClosed = new Deferred<void>();
+                const win = this.secondaryWindows[i];
+                win.addEventListener('unload', () => {
+                    windowClosed.resolve();
+                });
+                promises.push(windowClosed.promise);
+            }
+            for (let i = this.secondaryWindows.length - 1; i >= 0; i--) {
+                this.secondaryWindows[i].close();
+            }
+            return Promise.race([timeout(2000), Promise.all(promises).then(() => { })]);
+        });
+    }
+
     protected override windowCreated(newWindow: Window, widget: ExtractableWidget, shell: ApplicationShell): void {
         window.electronTheiaCore.setMenuBarVisible(false, newWindow.name);
         window.electronTheiaCore.setSecondaryWindowCloseRequestHandler(newWindow.name, () => this.canClose(widget, shell));

package/src/electron-browser/window/electron-window-service.ts

@@ -22,6 +22,7 @@ import { ElectronWindowPreferences } from './electron-window-preferences';
 import { ConnectionCloseService } from '../../common/messaging/connection-management';
 import { FrontendIdProvider } from '../../browser/messaging/frontend-id-provider';
 import { WindowReloadOptions } from '../../browser/window/window-service';
+import { Listener, ListenerList } from '../../common/listener';
 
 @injectable()
 export class ElectronWindowService extends DefaultWindowService {
@@ -48,6 +49,9 @@ export class ElectronWindowService extends DefaultWindowService {
     @inject(ConnectionCloseService)
     protected readonly connectionCloseService: ConnectionCloseService;
 
+    protected readonly onWillShutDownListeners = new ListenerList<void, Promise<void>>();
+    readonly onWillShutDown: Listener.Registration<void, Promise<void>> = this.onWillShutDownListeners.registration;
+
     override openNewWindow(url: string, { external }: NewWindowOptions = {}): undefined {
         this.delegate.openNewWindow(url, { external });
         return undefined;
@@ -74,7 +78,13 @@ export class ElectronWindowService extends DefaultWindowService {
     }
 
     protected override registerUnloadListeners(): void {
-        window.electronTheiaCore.setCloseRequestHandler(reason => this.isSafeToShutDown(reason));
+        window.electronTheiaCore.setCloseRequestHandler(async reason => {
+            const willShutDown = await this.isSafeToShutDown(reason);
+            if (willShutDown) {
+                await Listener.await(undefined, this.onWillShutDownListeners);
+            }
+            return willShutDown;
+        });
         window.addEventListener('unload', () => {
             this.onUnloadEmitter.fire();
         });

package/src/electron-main/theia-electron-window.ts

@@ -208,6 +208,8 @@ export class TheiaElectronWindow {
     }
 
     protected attachReloadListener(): void {
+        this.window.webContents.removeAllListeners('devtools-reload-page');
+        this.window.webContents.on('devtools-reload-page', () => this.reload());
         this.toDispose.push(TheiaRendererAPI.onRequestReload(this.window.webContents, (newUrl?: string) => this.reload(newUrl)));
     }
 

package/lib/common/menu/action-menu-node.d.ts

@@ -1,20 +0,0 @@
-import { CommandRegistry } from '../command';
-import { AlternativeHandlerMenuNode, CommandMenuNode, MenuAction, MenuNode } from './menu-types';
-/**
- * Node representing an action in the menu tree structure.
- * It's based on {@link MenuAction} for which it tries to determine the
- * best label, icon and sortString with the given data.
- */
-export declare class ActionMenuNode implements MenuNode, CommandMenuNode, Partial<AlternativeHandlerMenuNode> {
-    protected readonly action: MenuAction;
-    protected readonly commands: CommandRegistry;
-    readonly altNode: ActionMenuNode | undefined;
-    constructor(action: MenuAction, commands: CommandRegistry);
-    get command(): string;
-    get when(): string | undefined;
-    get id(): string;
-    get label(): string;
-    get icon(): string | undefined;
-    get sortString(): string;
-}
-//# sourceMappingURL=action-menu-node.d.ts.map

package/lib/common/menu/action-menu-node.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"action-menu-node.d.ts","sourceRoot":"","sources":["../../../src/common/menu/action-menu-node.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEjG;;;;GAIG;AACH,qBAAa,cAAe,YAAW,QAAQ,EAAE,eAAe,EAAE,OAAO,CAAC,0BAA0B,CAAC;IAK7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IACrC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe;IAJhD,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,CAAC;gBAGtB,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,eAAe;IAOhD,IAAI,OAAO,IAAI,MAAM,CAAkC;IAEvD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA6B;IAE3D,IAAI,EAAE,IAAI,MAAM,CAAkC;IAElD,IAAI,KAAK,IAAI,MAAM,CAUlB;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAM7B;IAED,IAAI,UAAU,IAAI,MAAM,CAA4C;CACvE"}

package/lib/common/menu/action-menu-node.js

@@ -1,57 +0,0 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionMenuNode = void 0;
-/**
- * Node representing an action in the menu tree structure.
- * It's based on {@link MenuAction} for which it tries to determine the
- * best label, icon and sortString with the given data.
- */
-class ActionMenuNode {
-    constructor(action, commands) {
-        this.action = action;
-        this.commands = commands;
-        if (action.alt) {
-            this.altNode = new ActionMenuNode({ commandId: action.alt }, commands);
-        }
-    }
-    get command() { return this.action.commandId; }
-    ;
-    get when() { return this.action.when; }
-    get id() { return this.action.commandId; }
-    get label() {
-        if (this.action.label) {
-            return this.action.label;
-        }
-        const cmd = this.commands.getCommand(this.action.commandId);
-        if (!cmd) {
-            console.debug(`No label for action menu node: No command "${this.action.commandId}" exists.`);
-            return '';
-        }
-        return cmd.label || cmd.id;
-    }
-    get icon() {
-        if (this.action.icon) {
-            return this.action.icon;
-        }
-        const command = this.commands.getCommand(this.action.commandId);
-        return command && command.iconClass;
-    }
-    get sortString() { return this.action.order || this.label; }
-}
-exports.ActionMenuNode = ActionMenuNode;
-//# sourceMappingURL=action-menu-node.js.map

package/lib/common/menu/action-menu-node.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"action-menu-node.js","sourceRoot":"","sources":["../../../src/common/menu/action-menu-node.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAKhF;;;;GAIG;AACH,MAAa,cAAc;IAIvB,YACuB,MAAkB,EAClB,QAAyB;QADzB,WAAM,GAAN,MAAM,CAAY;QAClB,aAAQ,GAAR,QAAQ,CAAiB;QAE5C,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;IAED,IAAI,OAAO,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAAA,CAAC;IAExD,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3D,IAAI,EAAE,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAElD,IAAI,KAAK;QACL,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,8CAA8C,IAAI,CAAC,MAAM,CAAC,SAAS,WAAW,CAAC,CAAC;YAC9F,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,IAAI;QACJ,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC;IACxC,CAAC;IAED,IAAI,UAAU,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;CACvE;AAxCD,wCAwCC"}

package/lib/common/menu/composite-menu-node.d.ts

@@ -1,47 +0,0 @@
-import { Disposable } from '../disposable';
-import { CompoundMenuNode, CompoundMenuNodeRole, MenuNode, MutableCompoundMenuNode, SubMenuOptions } from './menu-types';
-/**
- * Node representing a (sub)menu in the menu tree structure.
- */
-export declare class CompositeMenuNode implements MutableCompoundMenuNode {
-    readonly id: string;
-    label?: string | undefined;
-    readonly parent?: (import("./menu-types").MenuNodeMetadata & import("./menu-types").MenuNodeRenderingData & Partial<CompoundMenuNode> & Partial<import("./menu-types").CommandMenuNode> & Partial<import("./menu-types").AlternativeHandlerMenuNode> & CompoundMenuNode) | undefined;
-    protected readonly _children: MenuNode[];
-    iconClass?: string;
-    order?: string;
-    protected _when?: string;
-    protected _role?: CompoundMenuNodeRole;
-    constructor(id: string, label?: string | undefined, options?: SubMenuOptions, parent?: (import("./menu-types").MenuNodeMetadata & import("./menu-types").MenuNodeRenderingData & Partial<CompoundMenuNode> & Partial<import("./menu-types").CommandMenuNode> & Partial<import("./menu-types").AlternativeHandlerMenuNode> & CompoundMenuNode) | undefined);
-    get when(): string | undefined;
-    get icon(): string | undefined;
-    get children(): ReadonlyArray<MenuNode>;
-    get role(): CompoundMenuNodeRole;
-    addNode(node: MenuNode): Disposable;
-    removeNode(id: string): boolean;
-    updateOptions(options?: SubMenuOptions): void;
-    get sortString(): string;
-    get isSubmenu(): boolean;
-    /** @deprecated @since 1.28 use CompoundMenuNode.isNavigationGroup instead */
-    static isNavigationGroup: typeof CompoundMenuNode.isNavigationGroup;
-}
-export declare class CompositeMenuNodeWrapper implements MutableCompoundMenuNode {
-    protected readonly wrapped: Readonly<MutableCompoundMenuNode>;
-    readonly parent: CompoundMenuNode;
-    protected readonly options?: SubMenuOptions | undefined;
-    constructor(wrapped: Readonly<MutableCompoundMenuNode>, parent: CompoundMenuNode, options?: SubMenuOptions | undefined);
-    get id(): string;
-    get label(): string | undefined;
-    get sortString(): string;
-    get isSubmenu(): boolean;
-    get role(): CompoundMenuNodeRole;
-    get icon(): string | undefined;
-    get iconClass(): string | undefined;
-    get order(): string | undefined;
-    get when(): string | undefined;
-    get children(): ReadonlyArray<MenuNode>;
-    addNode(node: MenuNode): Disposable;
-    removeNode(id: string): boolean;
-    updateOptions(options: SubMenuOptions): void;
-}
-//# sourceMappingURL=composite-menu-node.d.ts.map

package/lib/common/menu/composite-menu-node.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"composite-menu-node.d.ts","sourceRoot":"","sources":["../../../src/common/menu/composite-menu-node.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,QAAQ,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEzH;;GAEG;AACH,qBAAa,iBAAkB,YAAW,uBAAuB;aAQzC,EAAE,EAAE,MAAM;IACnB,KAAK,CAAC;IAEb,QAAQ,CAAC,MAAM,CAAC;IAVpB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAM;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC;gBAGnB,EAAE,EAAE,MAAM,EACnB,KAAK,CAAC,oBAAQ,EACrB,OAAO,CAAC,EAAE,cAAc,EACf,MAAM,CAAC,oQAA6B;IAKjD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAAuB;IACrD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA2B;IACzD,IAAI,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,CAA2B;IAClE,IAAI,IAAI,IAAI,oBAAoB,CAAmG;IAEnI,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU;IAanC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAS/B,aAAa,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI;IAU7C,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,6EAA6E;IAC7E,MAAM,CAAC,iBAAiB,4CAAsC;CACjE;AAED,qBAAa,wBAAyB,YAAW,uBAAuB;IACxD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,uBAAuB,CAAC;IAAE,QAAQ,CAAC,MAAM,EAAE,gBAAgB;IAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAA1G,OAAO,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAAW,MAAM,EAAE,gBAAgB,EAAqB,OAAO,CAAC,4BAAgB;IAEzJ,IAAI,EAAE,IAAI,MAAM,CAA4B;IAE5C,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAA+B;IAE9D,IAAI,UAAU,IAAI,MAAM,CAA2D;IAEnF,IAAI,SAAS,IAAI,OAAO,CAAgC;IAExD,IAAI,IAAI,IAAI,oBAAoB,CAAoD;IAEpF,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA2B;IAEzD,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAAyD;IAE5F,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAA4B;IAE3D,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAAoD;IAElF,IAAI,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAkC;IAEzE,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU;IAEnC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAE/B,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;CAC/C"}