@theia/core 1.28.0-next.9 → 1.28.0

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

@@ -18,9 +18,7 @@
 
 import * as electronRemote from '../../../electron-shared/@electron/remote';
 import { inject, injectable, postConstruct } from 'inversify';
-import {
-    isOSX, ActionMenuNode, CompositeMenuNode, MAIN_MENU_BAR, MenuPath, MenuNode
-} from '../../common';
+import { isOSX, MAIN_MENU_BAR, MenuPath, MenuNode, CommandMenuNode, CompoundMenuNode, CompoundMenuNodeRole } from '../../common';
 import { Keybinding } from '../../common/keybinding';
 import { PreferenceService, CommonCommands } from '../../browser';
 import debounce = require('lodash.debounce');
@@ -36,6 +34,15 @@ export interface ElectronMenuOptions {
      * Defaults to `true`.
      */
     readonly showDisabled?: boolean;
+    /**
+     * A DOM context to use when evaluating any `when` clauses
+     * of menu items registered for this item.
+     */
+    context?: HTMLElement;
+    /**
+     * The root menu path for which the menu is being built.
+     */
+    rootMenuPath: MenuPath
 }
 
 /**
@@ -100,7 +107,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         const maxWidget = document.getElementsByClassName(MAXIMIZED_CLASS);
         if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
             const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR);
-            const template = this.fillMenuTemplate([], menuModel);
+            const template = this.fillMenuTemplate([], menuModel, [], { rootMenuPath: MAIN_MENU_BAR });
             if (isOSX) {
                 template.unshift(this.createOSXMenu());
             }
@@ -116,111 +123,90 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         return null;
     }
 
-    createElectronContextMenu(menuPath: MenuPath, args?: any[]): Electron.Menu {
+    createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement): Electron.Menu {
         const menuModel = this.menuProvider.getMenu(menuPath);
-        const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false });
+        const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false, context, rootMenuPath: menuPath });
         return electronRemote.Menu.buildFromTemplate(template);
     }
 
-    protected fillMenuTemplate(items: Electron.MenuItemConstructorOptions[],
-        menuModel: CompositeMenuNode,
-        args: any[] = [],
-        options?: ElectronMenuOptions
+    protected fillMenuTemplate(parentItems: Electron.MenuItemConstructorOptions[],
+        menu: MenuNode,
+        args: unknown[] = [],
+        options: ElectronMenuOptions
     ): Electron.MenuItemConstructorOptions[] {
-        const showDisabled = (options?.showDisabled === undefined) ? true : options?.showDisabled;
-        for (const menu of menuModel.children) {
-            if (menu instanceof CompositeMenuNode) {
-                if (menu.children.length > 0) {
-                    // do not render empty nodes
-
-                    if (menu.isSubmenu) { // submenu node
-
-                        const submenu = this.fillMenuTemplate([], menu, args, options);
-                        if (submenu.length === 0) {
-                            continue;
-                        }
-
-                        items.push({
-                            label: menu.label,
-                            submenu
-                        });
-
-                    } else { // group node
-
-                        // process children
-                        const submenu = this.fillMenuTemplate([], menu, args, options);
-                        if (submenu.length === 0) {
-                            continue;
-                        }
-
-                        if (items.length > 0) {
-                            // do not put a separator above the first group
-
-                            items.push({
-                                type: 'separator'
-                            });
-                        }
-
-                        // render children
-                        items.push(...submenu);
-                    }
-                }
-            } else if (menu instanceof ActionMenuNode) {
-                const node = menu.altNode && this.context.altPressed ? menu.altNode : menu;
-                const commandId = node.action.commandId;
-
-                // That is only a sanity check at application startup.
-                if (!this.commandRegistry.getCommand(commandId)) {
-                    console.debug(`Skipping menu item with missing command: "${commandId}".`);
-                    continue;
+        const showDisabled = options?.showDisabled !== false;
+
+        if (CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch(menu.when, options.context)) {
+            const role = CompoundMenuNode.getRole(menu);
+            if (role === CompoundMenuNodeRole.Group && menu.id === 'inline') { return parentItems; }
+            const children = CompoundMenuNode.getFlatChildren(menu.children);
+            const myItems: Electron.MenuItemConstructorOptions[] = [];
+            children.forEach(child => this.fillMenuTemplate(myItems, child, args, options));
+            if (myItems.length === 0) { return parentItems; }
+            if (role === CompoundMenuNodeRole.Submenu) {
+                parentItems.push({ label: menu.label, submenu: myItems });
+            } else if (role === CompoundMenuNodeRole.Group && menu.id !== 'inline') {
+                if (parentItems.length && parentItems[parentItems.length - 1].type !== 'separator') {
+                    parentItems.push({ type: 'separator' });
                 }
+                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.commandRegistry.isVisible(commandId, ...args)
-                    || (!!node.action.when && !this.contextKeyService.match(node.action.when))) {
-                    continue;
-                }
+            if (!this.menuCommandExecutor.isVisible(options.rootMenuPath, commandId, ...args) || !this.undefinedOrMatch(node.when, options.context)) {
+                return parentItems;
+            }
 
-                // We should omit rendering context-menu items which are disabled.
-                if (!showDisabled && !this.commandRegistry.isEnabled(commandId, ...args)) {
-                    continue;
-                }
+            // We should omit rendering context-menu items which are disabled.
+            if (!showDisabled && !this.menuCommandExecutor.isEnabled(options.rootMenuPath, commandId, ...args)) {
+                return parentItems;
+            }
 
-                const bindings = this.keybindingRegistry.getKeybindingsForCommand(commandId);
+            const bindings = this.keybindingRegistry.getKeybindingsForCommand(commandId);
 
-                const accelerator = bindings[0] && this.acceleratorFor(bindings[0]);
+            const accelerator = bindings[0] && this.acceleratorFor(bindings[0]);
 
-                const menuItem: Electron.MenuItemConstructorOptions = {
-                    id: node.id,
-                    label: node.label,
-                    type: this.commandRegistry.getToggledHandler(commandId, ...args) ? 'checkbox' : 'normal',
-                    checked: this.commandRegistry.isToggled(commandId, ...args),
-                    enabled: true, // https://github.com/eclipse-theia/theia/issues/446
-                    visible: true,
-                    accelerator,
-                    click: () => this.execute(commandId, args)
-                };
+            const menuItem: Electron.MenuItemConstructorOptions = {
+                id: node.id,
+                label: node.label,
+                type: this.commandRegistry.getToggledHandler(commandId, ...args) ? 'checkbox' : 'normal',
+                checked: this.commandRegistry.isToggled(commandId, ...args),
+                enabled: true, // https://github.com/eclipse-theia/theia/issues/446
+                visible: true,
+                accelerator,
+                click: () => this.execute(commandId, args, options.rootMenuPath)
+            };
 
-                if (isOSX) {
-                    const role = this.roleFor(node.id);
-                    if (role) {
-                        menuItem.role = role;
-                        delete menuItem.click;
-                    }
+            if (isOSX) {
+                const role = this.roleFor(node.id);
+                if (role) {
+                    menuItem.role = role;
+                    delete menuItem.click;
                 }
-                items.push(menuItem);
+            }
+            parentItems.push(menuItem);
 
-                if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
-                    this._toggledCommands.add(commandId);
-                }
-            } else {
-                items.push(...this.handleElectronDefault(menu, args, options));
+            if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
+                this._toggledCommands.add(commandId);
             }
         }
-        return items;
+        return parentItems;
     }
 
-    protected handleElectronDefault(menuNode: MenuNode, args: any[] = [], options?: ElectronMenuOptions): Electron.MenuItemConstructorOptions[] {
-        return [];
+    protected undefinedOrMatch(expression?: string, context?: HTMLElement): boolean {
+        if (expression) {
+            return this.contextKeyService.match(expression, context);
+        }
+        return true;
     }
 
     /**
@@ -268,17 +254,17 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
         return role;
     }
 
-    protected async execute(command: string, args: any[]): Promise<void> {
+    protected async execute(command: 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.commandRegistry.isEnabled(command, ...args)) {
-                await this.commandRegistry.executeCommand(command, ...args);
-                if (this._menu && this.commandRegistry.isVisible(command, ...args)) {
+            if (this.menuCommandExecutor.isEnabled(menuPath, command, ...args)) {
+                await this.menuCommandExecutor.executeCommand(menuPath, command, ...args);
+                if (this._menu && this.menuCommandExecutor.isVisible(menuPath, command, ...args)) {
                     const item = this._menu.getMenuItemById(command);
                     if (item) {
-                        item.checked = this.commandRegistry.isToggled(command, ...args);
+                        item.checked = this.menuCommandExecutor.isToggled(menuPath, command, ...args);
                         electronRemote.getCurrentWindow().setMenu(this._menu);
                     }
                 }

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

@@ -337,6 +337,14 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
                 command: ElectronCommands.ZOOM_IN.id,
                 keybinding: 'ctrlcmd+='
             },
+            {
+                command: ElectronCommands.ZOOM_IN.id,
+                keybinding: 'ctrlcmd+add'
+            },
+            {
+                command: ElectronCommands.ZOOM_OUT.id,
+                keybinding: 'ctrlcmd+subtract'
+            },
             {
                 command: ElectronCommands.ZOOM_OUT.id,
                 keybinding: 'ctrlcmd+-'

package/src/electron-browser/messaging/electron-ws-connection-provider.ts

@@ -37,7 +37,7 @@ export class ElectronWebSocketConnectionProvider extends WebSocketConnectionProv
         // Manually close the websocket connections `onStop`. Otherwise, the channels will be closed with 30 sec (`MessagingContribution#checkAliveTimeout`) delay.
         // https://github.com/eclipse-theia/theia/issues/6499
         // `1001` indicates that an endpoint is "going away", such as a server going down or a browser having navigated away from a page.
-        this.channelMultiPlexer?.onUnderlyingChannelClose({ reason: 'The frontend is "going away"', code: 1001 });
+        this.channelMultiplexer?.onUnderlyingChannelClose({ reason: 'The frontend is "going away"', code: 1001 });
     }
 
     override async openChannel(path: string, handler: (channel: Channel) => void, options?: WebSocketOptions): Promise<void> {

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

@@ -72,7 +72,7 @@ export class ElectronWindowService extends DefaultWindowService {
      * after running FrontendApplication `onWillStop` handlers or on the `cancelChannel` if it is not safe to exit.
      */
     protected async handleCloseRequestedEvent(event: CloseRequestArguments): Promise<void> {
-        const safeToClose = await this.isSafeToShutDown();
+        const safeToClose = await this.isSafeToShutDown(event.reason);
         if (safeToClose) {
             console.debug(`Shutting down because of ${StopReason[event.reason]} request.`);
             electron.ipcRenderer.send(event.confirmChannel);

package/src/electron-common/messaging/electron-messages.ts

@@ -14,6 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import { StopReason } from '../../common/frontend-application-state';
+/** @deprecated @since 1.28 import from common/frontend-application-state instead */
+export { StopReason };
+
 export const RequestTitleBarStyle = 'requestTitleBarStyle';
 export const TitleBarStyleChanged = 'titleBarStyleChanged';
 export const TitleBarStyleAtStartup = 'titleBarStyleAtStartup';
@@ -31,21 +35,6 @@ export const RELOAD_REQUESTED_SIGNAL = 'reload-requested';
  */
 export const APPLICATION_STATE_CHANGE_SIGNAL = 'application-state-changed';
 
-export enum StopReason {
-    /**
-     * Closing the window with no prospect of restart.
-     */
-    Close,
-    /**
-     * Reload without closing the window.
-     */
-    Reload,
-    /**
-     * Reload that includes closing the window.
-     */
-    Restart, // eslint-disable-line @typescript-eslint/no-shadow
-}
-
 export interface CloseRequestArguments {
     confirmChannel: string;
     cancelChannel: string;

package/src/electron-main/messaging/electron-messaging-contribution.ts

@@ -44,9 +44,9 @@ export class ElectronMessagingContribution implements ElectronMainApplicationCon
 
     protected readonly channelHandlers = new MessagingContribution.ConnectionHandlers<Channel>();
     /**
-     * Each electron window has a main chanel and its own multiplexer to route multiple client messages the same IPC connection.
+     * Each electron window has a main channel and its own multiplexer to route multiple client messages the same IPC connection.
      */
-    protected readonly windowChannelMultiplexer = new Map<number, { channel: ElectronWebContentChannel, multiPlexer: ChannelMultiplexer }>();
+    protected readonly windowChannelMultiplexer = new Map<number, { channel: ElectronWebContentChannel, multiplexer: ChannelMultiplexer }>();
 
     @postConstruct()
     protected init(): void {
@@ -67,10 +67,10 @@ export class ElectronMessagingContribution implements ElectronMainApplicationCon
     }
 
     // Creates a new multiplexer for a given sender/window
-    protected createWindowChannelData(sender: Electron.WebContents): { channel: ElectronWebContentChannel, multiPlexer: ChannelMultiplexer } {
+    protected createWindowChannelData(sender: Electron.WebContents): { channel: ElectronWebContentChannel, multiplexer: ChannelMultiplexer } {
         const mainChannel = this.createWindowMainChannel(sender);
-        const multiPlexer = new ChannelMultiplexer(mainChannel);
-        multiPlexer.onDidOpenChannel(openEvent => {
+        const multiplexer = new ChannelMultiplexer(mainChannel);
+        multiplexer.onDidOpenChannel(openEvent => {
             const { channel, id } = openEvent;
             if (this.channelHandlers.route(id, channel)) {
                 console.debug(`Opening channel for service path '${id}'.`);
@@ -78,9 +78,9 @@ export class ElectronMessagingContribution implements ElectronMainApplicationCon
             }
         });
 
-        sender.once('did-navigate', () => multiPlexer.onUnderlyingChannelClose({ reason: 'Window was refreshed' })); // When refreshing the browser window.
-        sender.once('destroyed', () => multiPlexer.onUnderlyingChannelClose({ reason: 'Window was closed' })); // When closing the browser window.
-        const data = { channel: mainChannel, multiPlexer };
+        sender.once('did-navigate', () => multiplexer.onUnderlyingChannelClose({ reason: 'Window was refreshed' })); // When refreshing the browser window.
+        sender.once('destroyed', () => multiplexer.onUnderlyingChannelClose({ reason: 'Window was closed' })); // When closing the browser window.
+        const data = { channel: mainChannel, multiplexer };
         this.windowChannelMultiplexer.set(sender.id, data);
         return data;
     }

package/lib/browser/shell/tab-bar-toolbar.d.ts

@@ -1,186 +0,0 @@
-/// <reference types="lodash" />
-import * as React from 'react';
-import { Widget, ReactWidget } from '../widgets';
-import { LabelParser } from '../label-parser';
-import { ContributionProvider } from '../../common/contribution-provider';
-import { FrontendApplicationContribution } from '../frontend-application';
-import { CommandRegistry } from '../../common/command';
-import { Disposable, DisposableCollection } from '../../common/disposable';
-import { ContextKeyService } from '../context-key-service';
-import { Event, Emitter } from '../../common/event';
-import { ContextMenuRenderer, Anchor } from '../context-menu-renderer';
-import { MenuModelRegistry } from '../../common/menu';
-/**
- * Clients should implement this interface if they want to contribute to the tab-bar toolbar.
- */
-export declare const TabBarToolbarContribution: unique symbol;
-/**
- * Representation of a tabbar toolbar contribution.
- */
-export interface TabBarToolbarContribution {
-    /**
-     * Registers toolbar items.
-     * @param registry the tabbar toolbar registry.
-     */
-    registerToolbarItems(registry: TabBarToolbarRegistry): void;
-}
-export interface TabBarDelegator extends Widget {
-    getTabBarDelegate(): Widget | undefined;
-}
-export declare namespace TabBarDelegator {
-    const is: (candidate?: Widget | undefined) => candidate is TabBarDelegator;
-}
-/**
- * Representation of an item in the tab
- */
-export interface TabBarToolbarItem {
-    /**
-     * The unique ID of the toolbar item.
-     */
-    readonly id: string;
-    /**
-     * The command to execute.
-     */
-    readonly command: string;
-    /**
-     * Optional text of the item.
-     *
-     * Shamelessly copied and reused from `status-bar`:
-     *
-     * More details about the available `fontawesome` icons and CSS class names can be hound [here](http://fontawesome.io/icons/).
-     * To set a text with icon use the following pattern in text string:
-     * ```typescript
-     * $(fontawesomeClassName)
-     * ```
-     *
-     * To use animated icons use the following pattern:
-     * ```typescript
-     * $(fontawesomeClassName~typeOfAnimation)
-     * ````
-     * The type of animation can be either `spin` or `pulse`.
-     * Look [here](http://fontawesome.io/examples/#animated) for more information to animated icons.
-     */
-    readonly text?: string;
-    /**
-     * Priority among the items. Can be negative. The smaller the number the left-most the item will be placed in the toolbar. It is `0` by default.
-     */
-    readonly priority?: number;
-    /**
-     * Optional group for the item. Default `navigation`.
-     * `navigation` group will be inlined, while all the others will be within the `...` dropdown.
-     * A group in format `submenu_group_1/submenu 1/.../submenu_group_n/ submenu n/item_group` means that the item will be located in a submenu(s) of the `...` dropdown.
-     * The submenu's title is named by the submenu section name, e.g. `group/<submenu name>/subgroup`.
-     */
-    readonly group?: string;
-    /**
-     * Optional tooltip for the item.
-     */
-    readonly tooltip?: string;
-    /**
-     * Optional icon for the item.
-     */
-    readonly icon?: string | (() => string);
-    /**
-     * https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts
-     */
-    readonly when?: string;
-    /**
-     * When defined, the container tool-bar will be updated if this event is fired.
-     *
-     * Note: currently, each item of the container toolbar will be re-rendered if any of the items have changed.
-     */
-    readonly onDidChange?: Event<void>;
-}
-/**
- * Tab-bar toolbar item backed by a `React.ReactNode`.
- * Unlike the `TabBarToolbarItem`, this item is not connected to the command service.
- */
-export interface ReactTabBarToolbarItem {
-    readonly id: string;
-    render(widget?: Widget): React.ReactNode;
-    readonly onDidChange?: Event<void>;
-    isVisible?(widget: Widget): boolean;
-    readonly when?: string;
-    readonly priority?: number;
-    /**
-     * Optional group for the item. Default `navigation`. Always inlined.
-     */
-    readonly group?: string;
-}
-export declare namespace TabBarToolbarItem {
-    /**
-     * Compares the items by `priority` in ascending. Undefined priorities will be treated as `0`.
-     */
-    const PRIORITY_COMPARATOR: (left: TabBarToolbarItem, right: TabBarToolbarItem) => number;
-    function is(arg: Object | undefined): arg is TabBarToolbarItem;
-}
-/**
- * Main, shared registry for tab-bar toolbar items.
- */
-export declare class TabBarToolbarRegistry implements FrontendApplicationContribution {
-    protected items: Map<string, TabBarToolbarItem | ReactTabBarToolbarItem>;
-    protected readonly commandRegistry: CommandRegistry;
-    protected readonly contextKeyService: ContextKeyService;
-    protected readonly contributionProvider: ContributionProvider<TabBarToolbarContribution>;
-    protected readonly onDidChangeEmitter: Emitter<void>;
-    readonly onDidChange: Event<void>;
-    protected fireOnDidChange: import("lodash").DebouncedFunc<() => any>;
-    onStart(): void;
-    /**
-     * Registers the given item. Throws an error, if the corresponding command cannot be found or an item has been already registered for the desired command.
-     *
-     * @param item the item to register.
-     */
-    registerItem(item: TabBarToolbarItem | ReactTabBarToolbarItem): Disposable;
-    /**
-     * Returns an array of tab-bar toolbar items which are visible when the `widget` argument is the current one.
-     *
-     * By default returns with all items where the command is enabled and `item.isVisible` is `true`.
-     */
-    visibleItems(widget: Widget): Array<TabBarToolbarItem | ReactTabBarToolbarItem>;
-    unregisterItem(itemOrId: TabBarToolbarItem | ReactTabBarToolbarItem | string): void;
-}
-/**
- * Factory for instantiating tab-bar toolbars.
- */
-export declare const TabBarToolbarFactory: unique symbol;
-export interface TabBarToolbarFactory {
-    (): TabBarToolbar;
-}
-/**
- * Tab-bar toolbar widget representing the active [tab-bar toolbar items](TabBarToolbarItem).
- */
-export declare class TabBarToolbar extends ReactWidget {
-    protected current: Widget | undefined;
-    protected inline: Map<string, TabBarToolbarItem | ReactTabBarToolbarItem>;
-    protected more: Map<string, TabBarToolbarItem>;
-    protected readonly commands: CommandRegistry;
-    protected readonly labelParser: LabelParser;
-    protected readonly menus: MenuModelRegistry;
-    protected readonly contextMenuRenderer: ContextMenuRenderer;
-    protected readonly toolbarRegistry: TabBarToolbarRegistry;
-    constructor();
-    updateItems(items: Array<TabBarToolbarItem | ReactTabBarToolbarItem>, current: Widget | undefined): void;
-    updateTarget(current?: Widget): void;
-    protected readonly toDisposeOnSetCurrent: DisposableCollection;
-    protected setCurrent(current: Widget | undefined): void;
-    protected render(): React.ReactNode;
-    protected renderItem(item: TabBarToolbarItem): React.ReactNode;
-    protected getToolbarItemClassNames(commandId: string | undefined): string;
-    protected renderMore(): React.ReactNode;
-    protected showMoreContextMenu: (event: React.MouseEvent) => void;
-    renderMoreContextMenu(anchor: Anchor): any;
-    shouldHandleMouseEvent(event: MouseEvent): boolean;
-    protected commandIsEnabled(command: string): boolean;
-    protected commandIsToggled(command: string): boolean;
-    protected executeCommand: (e: React.MouseEvent<HTMLElement>) => void;
-    protected onMouseDownEvent: (e: React.MouseEvent<HTMLElement>) => void;
-    protected onMouseUpEvent: (e: React.MouseEvent<HTMLElement>) => void;
-}
-export declare namespace TabBarToolbar {
-    namespace Styles {
-        const TAB_BAR_TOOLBAR = "p-TabBar-toolbar";
-        const TAB_BAR_TOOLBAR_ITEM = "item";
-    }
-}
-//# sourceMappingURL=tab-bar-toolbar.d.ts.map

package/lib/browser/shell/tab-bar-toolbar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tab-bar-toolbar.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/tab-bar-toolbar.tsx"],"names":[],"mappings":"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"}