@theia/core 1.28.0-next.9 → 1.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.28.0-next.9+c0ee4dcf6bb",
+  "version": "1.28.0",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -16,8 +16,8 @@
     "@phosphor/signaling": "1",
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
-    "@theia/application-package": "1.28.0-next.9+c0ee4dcf6bb",
-    "@theia/request": "1.28.0-next.9+c0ee4dcf6bb",
+    "@theia/application-package": "1.28.0",
+    "@theia/request": "1.28.0",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -41,6 +41,7 @@
     "drivelist": "^9.0.2",
     "es6-promise": "^4.2.4",
     "express": "^4.16.3",
+    "fast-json-stable-stringify": "^2.1.0",
     "file-icons-js": "~1.0.3",
     "font-awesome": "^4.7.0",
     "fs-extra": "^4.0.2",
@@ -193,12 +194,12 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.27.0",
-    "@theia/re-exports": "1.27.0",
+    "@theia/ext-scripts": "1.28.0",
+    "@theia/re-exports": "1.28.0",
     "minimist": "^1.2.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c0ee4dcf6bb10be905cc5a58d04b10faa3800d67"
+  "gitHead": "79d58c87a7bd76f435000a2ac59803b04e1c78be"
 }

package/src/browser/common-frontend-contribution.ts

@@ -272,10 +272,10 @@ export namespace CommonCommands {
         category: VIEW_CATEGORY,
         label: 'Show Menu Bar'
     });
-    export const NEW_FILE = Command.toDefaultLocalizedCommand({
+    export const NEW_UNTITLED_FILE = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.files.newUntitledFile',
         category: FILE_CATEGORY,
-        label: 'New File'
+        label: 'New Untitled File'
     });
     export const SAVE = Command.toDefaultLocalizedCommand({
         id: 'core.save',
@@ -721,7 +721,8 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         registry.registerSubmenu(CommonMenus.VIEW_APPEARANCE_SUBMENU, nls.localizeByDefault('Appearance'));
 
         registry.registerMenuAction(CommonMenus.FILE_NEW, {
-            commandId: CommonCommands.NEW_FILE.id,
+            commandId: CommonCommands.NEW_UNTITLED_FILE.id,
+            label: nls.localizeByDefault('New File'),
             order: 'a'
         });
     }
@@ -963,7 +964,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         commandRegistry.registerCommand(CommonCommands.CONFIGURE_DISPLAY_LANGUAGE, {
             execute: () => this.configureDisplayLanguage()
         });
-        commandRegistry.registerCommand(CommonCommands.NEW_FILE, {
+        commandRegistry.registerCommand(CommonCommands.NEW_UNTITLED_FILE, {
             execute: async () => {
                 const untitledUri = this.untitledResourceResolver.createUntitledURI('', await this.workingDirProvider.getUserWorkingDir());
                 this.untitledResourceResolver.resolve(untitledUri);
@@ -1104,7 +1105,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
                 when: 'activeEditorIsPinned'
             },
             {
-                command: CommonCommands.NEW_FILE.id,
+                command: CommonCommands.NEW_UNTITLED_FILE.id,
                 keybinding: this.isElectron() ? 'ctrlcmd+n' : 'alt+n',
             }
         );

package/src/browser/context-key-service.ts

@@ -34,7 +34,7 @@ export namespace ContextKey {
 }
 
 export interface ContextKeyChangeEvent {
-    affects(keys: Set<string>): boolean;
+    affects(keys: { has(key: string): boolean }): boolean;
 }
 
 export const ContextKeyService = Symbol('ContextKeyService');

package/src/browser/context-menu-renderer.ts

@@ -112,5 +112,10 @@ export interface RenderContextMenuOptions {
      * Default is `true`.
      */
     includeAnchorArg?: boolean;
+    /**
+     * A DOM context to use when evaluating any `when` clauses
+     * of menu items registered for this item.
+     */
+    context?: HTMLElement;
     onHide?: () => void;
 }

package/src/browser/frontend-application-module.ts

@@ -31,7 +31,11 @@ import {
     InMemoryResources,
     messageServicePath,
     InMemoryTextResourceResolver,
-    UntitledResourceResolver
+    UntitledResourceResolver,
+    MenuCommandAdapterRegistry,
+    MenuCommandExecutor,
+    MenuCommandAdapterRegistryImpl,
+    MenuCommandExecutorImpl
 } from '../common';
 import { KeybindingRegistry, KeybindingContext, KeybindingContribution } from './keybinding';
 import { FrontendApplication, FrontendApplicationContribution, DefaultFrontendApplicationContribution } from './frontend-application';
@@ -241,6 +245,8 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
 
     bind(MenuModelRegistry).toSelf().inSingletonScope();
     bindContributionProvider(bind, MenuContribution);
+    bind(MenuCommandAdapterRegistry).to(MenuCommandAdapterRegistryImpl).inSingletonScope();
+    bind(MenuCommandExecutor).to(MenuCommandExecutorImpl).inSingletonScope();
 
     bind(KeyboardLayoutService).toSelf().inSingletonScope();
     bind(KeybindingRegistry).toSelf().inSingletonScope();

package/src/browser/frontend-application.ts

@@ -26,6 +26,7 @@ import { preventNavigation, parseCssTime, animationFrame } from './browser';
 import { CorePreferences } from './core-preferences';
 import { WindowService } from './window/window-service';
 import { TooltipService } from './tooltip-service';
+import { StopReason } from '../common/frontend-application-state';
 
 /**
  * Clients can implement to get a callback for contributing widgets to a shell on start.
@@ -81,11 +82,11 @@ export interface OnWillStopAction<T = unknown> {
     /**
      * @resolves to a prepared value to be passed into the `action` function.
      */
-    prepare?: () => MaybePromise<T>;
+    prepare?: (stopReason?: StopReason) => MaybePromise<T>;
     /**
      * @resolves to `true` if it is safe to close the application; `false` otherwise.
      */
-    action: (prepared: T) => MaybePromise<boolean>;
+    action: (prepared: T, stopReason?: StopReason) => MaybePromise<boolean>;
     /**
      * A descriptive string for the reason preventing close.
      */

package/src/browser/keybinding.spec.ts

@@ -165,20 +165,30 @@ describe('keybindings', () => {
         }
     });
 
-    it('should remove all keybindings from a command that has multiple keybindings', () => {
+    it('should remove all disabled keybindings from a command that has multiple keybindings', () => {
         const keybindings: Keybinding[] = [{
             command: TEST_COMMAND2.id,
             keybinding: 'F3'
-        }];
+        },
+        {
+            command: '-' + TEST_COMMAND2.id,
+            context: 'testContext',
+            keybinding: 'ctrl+f1'
+        },
+        ];
 
         keybindingRegistry.setKeymap(KeybindingScope.USER, keybindings);
 
         const bindings = keybindingRegistry.getKeybindingsForCommand(TEST_COMMAND2.id);
         if (bindings) {
-            expect(bindings.length).to.be.equal(1);
+            // a USER one and a DEFAULT one
+            expect(bindings.length).to.be.equal(2);
             const keyCode = KeyCode.parse(bindings[0].keybinding);
             expect(keyCode.key).to.be.equal(Key.F3);
             expect(keyCode.ctrl).to.be.false;
+            const keyCode2 = KeyCode.parse(bindings[1].keybinding);
+            expect(keyCode2.key).to.be.equal(Key.F2);
+            expect(keyCode2.ctrl).to.be.true;
         }
     });
 

package/src/browser/keybinding.ts

@@ -434,20 +434,19 @@ export class KeybindingRegistry {
      */
     getKeybindingsForCommand(commandId: string): ScopedKeybinding[] {
         const result: ScopedKeybinding[] = [];
-
+        const disabledBindings: ScopedKeybinding[] = [];
         for (let scope = KeybindingScope.END - 1; scope >= KeybindingScope.DEFAULT; scope--) {
             this.keymaps[scope].forEach(binding => {
+                if (binding.command?.startsWith('-')) {
+                    disabledBindings.push(binding);
+                }
                 const command = this.commandRegistry.getCommand(binding.command);
-                if (command) {
-                    if (command.id === commandId) {
-                        result.push({ ...binding, scope });
-                    }
+                if (command
+                    && command.id === commandId
+                    && !disabledBindings.some(disabled => common.Keybinding.equals(disabled, { ...binding, command: '-' + binding.command }, false, true))) {
+                    result.push({ ...binding, scope });
                 }
             });
-
-            if (result.length > 0) {
-                return result;
-            }
         }
         return result;
     }

package/src/browser/menu/browser-context-menu-renderer.ts

@@ -36,8 +36,8 @@ export class BrowserContextMenuRenderer extends ContextMenuRenderer {
         super();
     }
 
-    protected doRender({ menuPath, anchor, args, onHide }: RenderContextMenuOptions): ContextMenuAccess {
-        const contextMenu = this.menuFactory.createContextMenu(menuPath, args);
+    protected doRender({ menuPath, anchor, args, onHide, context }: RenderContextMenuOptions): ContextMenuAccess {
+        const contextMenu = this.menuFactory.createContextMenu(menuPath, args, context);
         const { x, y } = coordinateFromAnchor(anchor);
         if (onHide) {
             contextMenu.aboutToClose.connect(() => onHide!());

package/src/browser/menu/browser-menu-plugin.ts

@@ -18,8 +18,8 @@ import { injectable, inject } from 'inversify';
 import { MenuBar, Menu as MenuWidget, Widget } from '@phosphor/widgets';
 import { CommandRegistry as PhosphorCommandRegistry } from '@phosphor/commands';
 import {
-    CommandRegistry, ActionMenuNode, CompositeMenuNode, environment,
-    MenuModelRegistry, MAIN_MENU_BAR, MenuPath, DisposableCollection, Disposable, MenuNode
+    CommandRegistry, CompositeMenuNode, environment,
+    MenuModelRegistry, MAIN_MENU_BAR, MenuPath, DisposableCollection, Disposable, MenuNode, MenuCommandExecutor, CompoundMenuNode, CompoundMenuNodeRole, CommandMenuNode
 } from '../../common';
 import { KeybindingRegistry } from '../keybinding';
 import { FrontendApplicationContribution, FrontendApplication } from '../frontend-application';
@@ -35,6 +35,12 @@ export abstract class MenuBarWidget extends MenuBar {
     abstract triggerMenuItem(label: string, ...labels: string[]): Promise<MenuWidget.IItem>;
 }
 
+export interface BrowserMenuOptions extends MenuWidget.IOptions {
+    commands: MenuCommandRegistry,
+    context?: HTMLElement,
+    rootMenuPath: MenuPath
+};
+
 @injectable()
 export class BrowserMainMenuFactory implements MenuWidgetFactory {
 
@@ -47,6 +53,9 @@ export class BrowserMainMenuFactory implements MenuWidgetFactory {
     @inject(CommandRegistry)
     protected readonly commandRegistry: CommandRegistry;
 
+    @inject(MenuCommandExecutor)
+    protected readonly menuCommandExecutor: MenuCommandExecutor;
+
     @inject(CorePreferences)
     protected readonly corePreferences: CorePreferences;
 
@@ -92,50 +101,39 @@ export class BrowserMainMenuFactory implements MenuWidgetFactory {
         const menuCommandRegistry = this.createMenuCommandRegistry(menuModel);
         for (const menu of menuModel.children) {
             if (menu instanceof CompositeMenuNode) {
-                const menuWidget = this.createMenuWidget(menu, { commands: menuCommandRegistry });
+                const menuWidget = this.createMenuWidget(menu, { commands: menuCommandRegistry, rootMenuPath: MAIN_MENU_BAR });
                 menuBar.addMenu(menuWidget);
             }
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    createContextMenu(path: MenuPath, args?: any[]): MenuWidget {
+    createContextMenu(path: MenuPath, args?: unknown[], context?: HTMLElement): MenuWidget {
         const menuModel = this.menuProvider.getMenu(path);
-        const menuCommandRegistry = this.createMenuCommandRegistry(menuModel, args).snapshot();
-        const contextMenu = this.createMenuWidget(menuModel, { commands: menuCommandRegistry });
+        const menuCommandRegistry = this.createMenuCommandRegistry(menuModel, args).snapshot(path);
+        const contextMenu = this.createMenuWidget(menuModel, { commands: menuCommandRegistry, context, rootMenuPath: path });
         return contextMenu;
     }
 
-    createMenuWidget(menu: CompositeMenuNode, options: MenuWidget.IOptions & { commands: MenuCommandRegistry }): DynamicMenuWidget {
+    createMenuWidget(menu: CompositeMenuNode, options: BrowserMenuOptions): DynamicMenuWidget {
         return new DynamicMenuWidget(menu, options, this.services);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected createMenuCommandRegistry(menu: CompositeMenuNode, args: any[] = []): MenuCommandRegistry {
+    protected createMenuCommandRegistry(menu: CompositeMenuNode, args: unknown[] = []): MenuCommandRegistry {
         const menuCommandRegistry = new MenuCommandRegistry(this.services);
         this.registerMenu(menuCommandRegistry, menu, args);
         return menuCommandRegistry;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected registerMenu(menuCommandRegistry: MenuCommandRegistry, menu: CompositeMenuNode, args: any[]): void {
-        for (const child of menu.children) {
-            if (child instanceof ActionMenuNode) {
-                menuCommandRegistry.registerActionMenu(child, args);
-                if (child.altNode) {
-                    menuCommandRegistry.registerActionMenu(child.altNode, args);
-                }
-            } else if (child instanceof CompositeMenuNode) {
-                this.registerMenu(menuCommandRegistry, child, args);
-            } else {
-                this.handleDefault(menuCommandRegistry, child, args);
+    protected registerMenu(menuCommandRegistry: MenuCommandRegistry, menu: MenuNode, args: unknown[]): void {
+        if (CompoundMenuNode.is(menu)) {
+            menu.children.forEach(child => this.registerMenu(menuCommandRegistry, child, args));
+        } else if (CommandMenuNode.is(menu)) {
+            menuCommandRegistry.registerActionMenu(menu, args);
+            if (menu.altNode) {
+                menuCommandRegistry.registerActionMenu(menu.altNode, args);
             }
-        }
-    }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected handleDefault(menuCommandRegistry: MenuCommandRegistry, menuNode: MenuNode, args: any[]): void {
-        // NOOP
+        }
     }
 
     protected get services(): MenuServices {
@@ -144,7 +142,8 @@ export class BrowserMainMenuFactory implements MenuWidgetFactory {
             contextKeyService: this.contextKeyService,
             commandRegistry: this.commandRegistry,
             keybindingRegistry: this.keybindingRegistry,
-            menuWidgetFactory: this
+            menuWidgetFactory: this,
+            commandExecutor: this.menuCommandExecutor,
         };
     }
 
@@ -225,10 +224,11 @@ export class MenuServices {
     readonly contextKeyService: ContextKeyService;
     readonly context: ContextMenuContext;
     readonly menuWidgetFactory: MenuWidgetFactory;
+    readonly commandExecutor: MenuCommandExecutor;
 }
 
 export interface MenuWidgetFactory {
-    createMenuWidget(menu: CompositeMenuNode, options: MenuWidget.IOptions & { commands: MenuCommandRegistry }): MenuWidget;
+    createMenuWidget(menu: MenuNode & Required<Pick<MenuNode, 'children'>>, options: BrowserMenuOptions): MenuWidget;
 }
 
 /**
@@ -243,7 +243,7 @@ export class DynamicMenuWidget extends MenuWidget {
 
     constructor(
         protected menu: CompositeMenuNode,
-        protected options: MenuWidget.IOptions & { commands: MenuCommandRegistry },
+        protected options: BrowserMenuOptions,
         protected services: MenuServices
     ) {
         super(options);
@@ -260,7 +260,7 @@ export class DynamicMenuWidget extends MenuWidget {
         this.preserveFocusedElement(previousFocusedElement);
         this.clearItems();
         this.runWithPreservedFocusContext(() => {
-            this.options.commands.snapshot();
+            this.options.commands.snapshot(this.options.rootMenuPath);
             this.updateSubMenus(this, this.menu, this.options.commands);
         });
     }
@@ -275,59 +275,51 @@ export class DynamicMenuWidget extends MenuWidget {
         super.open(x, y, options);
     }
 
-    private updateSubMenus(parent: MenuWidget, menu: CompositeMenuNode, commands: MenuCommandRegistry): void {
+    protected updateSubMenus(parent: MenuWidget, menu: CompositeMenuNode, commands: MenuCommandRegistry): void {
         const items = this.buildSubMenus([], menu, commands);
+        while (items[items.length - 1]?.type === 'separator') {
+            items.pop();
+        }
         for (const item of items) {
             parent.addItem(item);
         }
     }
 
-    private buildSubMenus(items: MenuWidget.IItemOptions[], menu: CompositeMenuNode, commands: MenuCommandRegistry): MenuWidget.IItemOptions[] {
-        for (const item of menu.children) {
-            if (item instanceof CompositeMenuNode) {
-                if (item.children.length) { // do not render empty nodes
-                    if (item.isSubmenu) { // submenu node
-                        const submenu = this.services.menuWidgetFactory.createMenuWidget(item, this.options);
-                        if (!submenu.items.length) {
-                            continue;
-                        }
-                        items.push({
-                            type: 'submenu',
-                            submenu,
-                        });
-                    } else { // group node
-                        const submenu = this.buildSubMenus([], item, commands);
-                        if (!submenu.length) {
-                            continue;
-                        }
-                        if (items.length) { // do not put a separator above the first group
-                            items.push({
-                                type: 'separator'
-                            });
-                        }
-                        items.push(...submenu); // render children
+    protected buildSubmenusCalled = 0;
+
+    protected buildSubMenus(parentItems: MenuWidget.IItemOptions[], menu: MenuNode, commands: MenuCommandRegistry): MenuWidget.IItemOptions[] {
+        if (CompoundMenuNode.is(menu) && menu.children.length && this.undefinedOrMatch(menu.when, this.options.context)) {
+            const role = menu === this.menu ? CompoundMenuNodeRole.Group : CompoundMenuNode.getRole(menu);
+            if (role === CompoundMenuNodeRole.Submenu) {
+                const submenu = this.services.menuWidgetFactory.createMenuWidget(menu, this.options);
+                parentItems.push({ type: 'submenu', submenu });
+            } else if (role === CompoundMenuNodeRole.Group && menu.id !== 'inline') {
+                const children = CompoundMenuNode.getFlatChildren(menu.children);
+                const myItems: MenuWidget.IItemOptions[] = [];
+                children.forEach(child => this.buildSubMenus(myItems, child, commands));
+                if (myItems.length) {
+                    if (parentItems.length && parentItems[parentItems.length - 1].type !== 'separator') {
+                        parentItems.push({ type: 'separator' });
                     }
+                    parentItems.push(...myItems);
+                    parentItems.push({ type: 'separator' });
                 }
-            } else if (item instanceof ActionMenuNode) {
-                const { context, contextKeyService } = this.services;
-                const node = item.altNode && context.altPressed ? item.altNode : item;
-                const { when } = node.action;
-                if (!(commands.isVisible(node.action.commandId) && (!when || contextKeyService.match(when)))) {
-                    continue;
-                }
-                items.push({
-                    command: node.action.commandId,
+            }
+        } else if (menu.command) {
+            const node = menu.altNode && this.services.context.altPressed ? menu.altNode : (menu as MenuNode & CommandMenuNode);
+            if (commands.isVisible(node.command) && this.undefinedOrMatch(node.when, this.options.context)) {
+                parentItems.push({
+                    command: node.command,
                     type: 'command'
                 });
-            } else {
-                items.push(...this.handleDefault(item));
             }
         }
-        return items;
+        return parentItems;
     }
 
-    protected handleDefault(menuNode: MenuNode): MenuWidget.IItemOptions[] {
-        return [];
+    protected undefinedOrMatch(expression?: string, context?: HTMLElement): boolean {
+        if (expression) { return this.services.contextKeyService.match(expression, context); }
+        return true;
     }
 
     protected preserveFocusedElement(previousFocusedElement: Element | null = document.activeElement): boolean {
@@ -418,19 +410,16 @@ export class BrowserMenuBarContribution implements FrontendApplicationContributi
  */
 export class MenuCommandRegistry extends PhosphorCommandRegistry {
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected actions = new Map<string, [ActionMenuNode, any[]]>();
+    protected actions = new Map<string, [MenuNode & CommandMenuNode, unknown[]]>();
     protected toDispose = new DisposableCollection();
 
     constructor(protected services: MenuServices) {
         super();
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    registerActionMenu(menu: ActionMenuNode, args: any[]): void {
-        const { commandId } = menu.action;
+    registerActionMenu(menu: MenuNode & CommandMenuNode, args: unknown[]): void {
         const { commandRegistry } = this.services;
-        const command = commandRegistry.getCommand(commandId);
+        const command = commandRegistry.getCommand(menu.command);
         if (!command) {
             return;
         }
@@ -441,18 +430,17 @@ export class MenuCommandRegistry extends PhosphorCommandRegistry {
         this.actions.set(id, [menu, args]);
     }
 
-    snapshot(): this {
+    snapshot(menuPath: MenuPath): this {
         this.toDispose.dispose();
         for (const [menu, args] of this.actions.values()) {
-            this.toDispose.push(this.registerCommand(menu, args));
+            this.toDispose.push(this.registerCommand(menu, args, menuPath));
         }
         return this;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected registerCommand(menu: ActionMenuNode, args: any[]): Disposable {
-        const { commandRegistry, keybindingRegistry } = this.services;
-        const command = commandRegistry.getCommand(menu.action.commandId);
+    protected registerCommand(menu: MenuNode & CommandMenuNode, args: unknown[], menuPath: MenuPath): Disposable {
+        const { commandRegistry, keybindingRegistry, commandExecutor } = this.services;
+        const command = commandRegistry.getCommand(menu.command);
         if (!command) {
             return Disposable.NULL;
         }
@@ -463,11 +451,11 @@ export class MenuCommandRegistry extends PhosphorCommandRegistry {
         }
 
         // We freeze the `isEnabled`, `isVisible`, and `isToggled` states so they won't change.
-        const enabled = commandRegistry.isEnabled(id, ...args);
-        const visible = commandRegistry.isVisible(id, ...args);
-        const toggled = commandRegistry.isToggled(id, ...args);
+        const enabled = commandExecutor.isEnabled(menuPath, id, ...args);
+        const visible = commandExecutor.isVisible(menuPath, id, ...args);
+        const toggled = commandExecutor.isToggled(menuPath, id, ...args);
         const unregisterCommand = this.addCommand(id, {
-            execute: () => commandRegistry.executeCommand(id, ...args),
+            execute: () => commandExecutor.executeCommand(menuPath, id, ...args),
             label: menu.label,
             icon: menu.icon,
             isEnabled: () => enabled,

package/src/browser/resource-context-key.ts

@@ -36,6 +36,7 @@ export class ResourceContextKey {
     protected resourceLangId: ContextKey<string>;
     protected resourceDirName: ContextKey<string>;
     protected resourcePath: ContextKey<string>;
+    protected resourceSet: ContextKey<boolean>;
 
     @postConstruct()
     protected init(): void {
@@ -46,6 +47,7 @@ export class ResourceContextKey {
         this.resourceLangId = this.contextKeyService.createKey<string>('resourceLangId', undefined);
         this.resourceDirName = this.contextKeyService.createKey<string>('resourceDirName', undefined);
         this.resourcePath = this.contextKeyService.createKey<string>('resourcePath', undefined);
+        this.resourceSet = this.contextKeyService.createKey<boolean>('resourceSet', false);
     }
 
     get(): URI | undefined {
@@ -54,13 +56,14 @@ export class ResourceContextKey {
     }
 
     set(resourceUri: URI | undefined): void {
-        this.resource.set(resourceUri && resourceUri['codeUri']);
-        this.resourceSchemeKey.set(resourceUri && resourceUri.scheme);
-        this.resourceFileName.set(resourceUri && resourceUri.path.base);
-        this.resourceExtname.set(resourceUri && resourceUri.path.ext);
+        this.resource.set(resourceUri?.['codeUri']);
+        this.resourceSchemeKey.set(resourceUri?.scheme);
+        this.resourceFileName.set(resourceUri?.path.base);
+        this.resourceExtname.set(resourceUri?.path.ext);
         this.resourceLangId.set(resourceUri && this.getLanguageId(resourceUri));
-        this.resourceDirName.set(resourceUri && resourceUri.path.dir.fsPath());
-        this.resourcePath.set(resourceUri && resourceUri.path.fsPath());
+        this.resourceDirName.set(resourceUri?.path.dir.fsPath());
+        this.resourcePath.set(resourceUri?.path.fsPath());
+        this.resourceSet.set(Boolean(resourceUri));
     }
 
     protected getLanguageId(uri: URI | undefined): string | undefined {

package/src/browser/shell/shell-layout-restorer.ts

@@ -27,6 +27,7 @@ import { MaybePromise } from '../../common/types';
 import { ApplicationShell, applicationShellLayoutVersion, ApplicationShellLayoutVersion } from './application-shell';
 import { CommonCommands } from '../common-frontend-contribution';
 import { WindowService } from '../window/window-service';
+import { StopReason } from '../../common/frontend-application-state';
 
 /**
  * A contract for widgets that want to store and restore their inner state, between sessions.
@@ -139,7 +140,7 @@ export class ShellLayoutRestorer implements CommandContribution {
     }
 
     protected async resetLayout(): Promise<void> {
-        if (await this.windowService.isSafeToShutDown()) {
+        if (await this.windowService.isSafeToShutDown(StopReason.Reload)) {
             this.logger.info('>>> Resetting layout...');
             this.shouldStoreLayout = false;
             this.storageService.setData(this.storageKey, undefined);

package/src/browser/shell/side-panel-toolbar.ts

@@ -101,7 +101,6 @@ export class SidePanelToolbar extends BaseWidget {
         }
     }
 
-    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
     showMoreContextMenu(anchor: Anchor): ContextMenuAccess {
         if (this.toolbar) {
             return this.toolbar.renderMoreContextMenu(anchor);

package/src/browser/shell/tab-bar-toolbar/index.ts

@@ -0,0 +1,19 @@
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+export * from './tab-bar-toolbar';
+export * from './tab-bar-toolbar-registry';
+export * from './tab-bar-toolbar-types';

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts

@@ -0,0 +1,31 @@
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { MenuNode, MenuPath } from '../../../common';
+import { NAVIGATION, TabBarToolbarItem } from './tab-bar-toolbar-types';
+
+export const TOOLBAR_WRAPPER_ID_SUFFIX = '-as-tabbar-toolbar-item';
+
+export class ToolbarMenuNodeWrapper implements TabBarToolbarItem {
+    constructor(protected readonly menuNode: MenuNode, readonly group?: string, readonly menuPath?: MenuPath) { }
+    get id(): string { return this.menuNode.id + TOOLBAR_WRAPPER_ID_SUFFIX; }
+    get command(): string { return this.menuNode.command ?? ''; };
+    get icon(): string | undefined { return this.menuNode.icon; }
+    get tooltip(): string | undefined { return this.menuNode.label; }
+    get when(): string | undefined { return this.menuNode.when; }
+    get text(): string | undefined { return (this.group === NAVIGATION || this.group === undefined) ? undefined : this.menuNode.label; }
+}
+