@theia/core 1.53.0-next.6 → 1.53.1

package/lib/node/i18n/theia-localization-contribution.js

@@ -20,18 +20,22 @@ const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
 let TheiaLocalizationContribution = class TheiaLocalizationContribution {
     async registerLocalizations(registry) {
-        registry.registerLocalizationFromRequire('cs', require('../../../i18n/nls.cs.json'));
-        registry.registerLocalizationFromRequire('de', require('../../../i18n/nls.de.json'));
-        registry.registerLocalizationFromRequire('es', require('../../../i18n/nls.es.json'));
+        // Attempt to use the same languages as VS Code
+        // See https://code.visualstudio.com/docs/getstarted/locales#_available-locales
+        registry.registerLocalizationFromRequire('zh-cn', require('../../../i18n/nls.zh-cn.json'));
+        registry.registerLocalizationFromRequire('zh-tw', require('../../../i18n/nls.zh-tw.json'));
         registry.registerLocalizationFromRequire('fr', require('../../../i18n/nls.fr.json'));
-        registry.registerLocalizationFromRequire('hu', require('../../../i18n/nls.hu.json'));
+        registry.registerLocalizationFromRequire('de', require('../../../i18n/nls.de.json'));
         registry.registerLocalizationFromRequire('it', require('../../../i18n/nls.it.json'));
+        registry.registerLocalizationFromRequire('es', require('../../../i18n/nls.es.json'));
         registry.registerLocalizationFromRequire('ja', require('../../../i18n/nls.ja.json'));
-        registry.registerLocalizationFromRequire('pl', require('../../../i18n/nls.pl.json'));
-        registry.registerLocalizationFromRequire('pt-br', require('../../../i18n/nls.pt-br.json'));
-        registry.registerLocalizationFromRequire('pt-pt', require('../../../i18n/nls.pt-pt.json'));
+        registry.registerLocalizationFromRequire('ko', require('../../../i18n/nls.ko.json'));
         registry.registerLocalizationFromRequire('ru', require('../../../i18n/nls.ru.json'));
-        registry.registerLocalizationFromRequire('zh-cn', require('../../../i18n/nls.zh-cn.json'));
+        registry.registerLocalizationFromRequire('pt-br', require('../../../i18n/nls.pt-br.json'));
+        registry.registerLocalizationFromRequire('tr', require('../../../i18n/nls.tr.json'));
+        registry.registerLocalizationFromRequire('pl', require('../../../i18n/nls.pl.json'));
+        registry.registerLocalizationFromRequire('cs', require('../../../i18n/nls.cs.json'));
+        registry.registerLocalizationFromRequire('hu', require('../../../i18n/nls.hu.json'));
     }
 };
 exports.TheiaLocalizationContribution = TheiaLocalizationContribution;

package/lib/node/i18n/theia-localization-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"theia-localization-contribution.js","sourceRoot":"","sources":["../../../src/node/i18n/theia-localization-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAEhF,yCAAuC;AAIhC,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACtC,KAAK,CAAC,qBAAqB,CAAC,QAA8B;QACtD,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC3F,QAAQ,CAAC,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC3F,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;IAC/F,CAAC;CACJ,CAAA;AAfY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAezC"}
+{"version":3,"file":"theia-localization-contribution.js","sourceRoot":"","sources":["../../../src/node/i18n/theia-localization-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAEhF,yCAAuC;AAIhC,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACtC,KAAK,CAAC,qBAAqB,CAAC,QAA8B;QACtD,+CAA+C;QAC/C,+EAA+E;QAC/E,QAAQ,CAAC,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC3F,QAAQ,CAAC,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC3F,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC3F,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;IACzF,CAAC;CACJ,CAAA;AAnBY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAmBzC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.53.0-next.6+5255c512c",
+  "version": "1.53.1",
   "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.53.0-next.6+5255c512c",
-    "@theia/request": "1.53.0-next.6+5255c512c",
+    "@theia/application-package": "1.53.1",
+    "@theia/request": "1.53.1",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -203,18 +203,20 @@
     "generate-layout": "electron ./scripts/generate-layout",
     "generate-theia-re-exports": "theia-re-exports generate && theia-re-exports template README_TEMPLATE.md > README.md",
     "lint": "theiaext lint",
-    "prepare": "yarn -s generate-theia-re-exports",
+    "prepare": "yarn -s generate-theia-re-exports && yarn download:json-schema",
+    "download:json-schema": "node ./scripts/download-catalog.js",
     "test": "theiaext test",
     "version": "yarn -s generate-theia-re-exports",
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.52.0",
-    "@theia/re-exports": "1.52.0",
-    "minimist": "^1.2.0"
+    "@theia/ext-scripts": "1.53.1",
+    "@theia/re-exports": "1.53.1",
+    "minimist": "^1.2.0",
+    "nodejs-file-downloader": "4.13.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "5255c512c6c9da44c11cb4d5fca7379de60b71cc"
+  "gitHead": "e891c9be687dce3645614b7b75ec0dcd4c2057f4"
 }

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

@@ -16,6 +16,7 @@
 
 import { injectable } from 'inversify';
 import { Emitter, Event } from '../common/event';
+import { Disposable } from '../common';
 
 export type ContextKeyValue = null | undefined | boolean | number | string
     | Array<null | undefined | boolean | number | string>
@@ -83,11 +84,10 @@ export interface ContextKeyService extends ContextMatcher {
     setContext(key: string, value: unknown): void;
 }
 
-export type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with' | 'createOverlay'>;
+export type ScopedValueStore = Omit<ContextKeyService, 'onDidChange' | 'match' | 'parseKeys' | 'with' | 'createOverlay'> & Disposable;
 
 @injectable()
 export class ContextKeyServiceDummyImpl implements ContextKeyService {
-
     protected readonly onDidChangeEmitter = new Emitter<ContextKeyChangeEvent>();
     readonly onDidChange = this.onDidChangeEmitter.event;
     protected fireDidChange(event: ContextKeyChangeEvent): void {
@@ -122,7 +122,7 @@ export class ContextKeyServiceDummyImpl implements ContextKeyService {
     /**
      * Details should implemented by an extension, e.g. by the monaco extension.
      */
-    createScoped(target: HTMLElement): ContextKeyService {
+    createScoped(target: HTMLElement): ScopedValueStore {
         return this;
     }
 

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

@@ -465,7 +465,6 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     bind(FrontendApplicationContribution).toService(StylingService);
 
     bind(SecondaryWindowHandler).toSelf().inSingletonScope();
-
     bind(ViewColumnService).toSelf().inSingletonScope();
 
     bind(UndoRedoHandlerService).toSelf().inSingletonScope();

package/src/browser/json-schema-store.ts

@@ -18,9 +18,7 @@ import { injectable, inject, named } from 'inversify';
 import { ContributionProvider } from '../common/contribution-provider';
 import { FrontendApplicationContribution } from './frontend-application-contribution';
 import { MaybePromise } from '../common';
-import { Endpoint } from './endpoint';
 import { timeout, Deferred } from '../common/promise-util';
-import { RequestContext, RequestService } from '@theia/request';
 
 export interface JsonSchemaConfiguration {
     fileMatch: string | string[];
@@ -95,16 +93,9 @@ export class JsonSchemaStore implements FrontendApplicationContribution {
 
 @injectable()
 export class DefaultJsonSchemaContribution implements JsonSchemaContribution {
-
-    @inject(RequestService)
-    protected readonly requestService: RequestService;
-
-    protected readonly jsonSchemaUrl = `${new Endpoint().httpScheme}//schemastore.org/api/json/catalog.json`;
-
     async registerSchemas(context: JsonSchemaRegisterContext): Promise<void> {
-        const response = await this.requestService.request({ url: this.jsonSchemaUrl });
-        const schemas = RequestContext.asJson<{ schemas: DefaultJsonSchemaContribution.SchemaData[] }>(response).schemas;
-        for (const s of schemas) {
+        const catalog = require('./catalog.json') as { schemas: DefaultJsonSchemaContribution.SchemaData[] };
+        for (const s of catalog.schemas) {
             if (s.fileMatch) {
                 context.registerSchema({
                     fileMatch: s.fileMatch,

package/src/browser/opener-service.ts

@@ -79,6 +79,12 @@ export interface OpenerService {
      * Add open handler i.e. for custom editors
      */
     addHandler?(openHandler: OpenHandler): Disposable;
+
+    /**
+     * Remove open handler
+     */
+    removeHandler?(openHandler: OpenHandler): void;
+
     /**
      * Event that fires when a new opener is added or removed.
      */
@@ -108,11 +114,15 @@ export class DefaultOpenerService implements OpenerService {
         this.onDidChangeOpenersEmitter.fire();
 
         return Disposable.create(() => {
-            this.customEditorOpenHandlers.splice(this.customEditorOpenHandlers.indexOf(openHandler), 1);
-            this.onDidChangeOpenersEmitter.fire();
+            this.removeHandler(openHandler);
         });
     }
 
+    removeHandler(openHandler: OpenHandler): void {
+        this.customEditorOpenHandlers.splice(this.customEditorOpenHandlers.indexOf(openHandler), 1);
+        this.onDidChangeOpenersEmitter.fire();
+    }
+
     async getOpener(uri: URI, options?: OpenerOptions): Promise<OpenHandler> {
         const handlers = await this.prioritize(uri, options);
         if (handlers.length >= 1) {

package/src/browser/saveable-service.ts

@@ -174,7 +174,10 @@ export class SaveableService implements FrontendApplicationContribution {
         setDirty(saveableWidget, saveable.dirty);
         saveable.onDirtyChanged(() => setDirty(saveableWidget, saveable.dirty));
         const closeWithSaving = this.createCloseWithSaving();
-        const closeWithoutSaving = () => this.closeWithoutSaving(saveableWidget, false);
+        const closeWithoutSaving = async () => {
+            const revert = Saveable.closingWidgetWouldLoseSaveable(saveableWidget, Array.from(this.saveThrottles.keys()));
+            await this.closeWithoutSaving(saveableWidget, revert);
+        };
         Object.assign(saveableWidget, {
             closeWithoutSaving,
             closeWithSaving,
@@ -224,7 +227,8 @@ export class SaveableService implements FrontendApplicationContribution {
         }
         const notLastWithDocument = !Saveable.closingWidgetWouldLoseSaveable(widget, Array.from(this.saveThrottles.keys()));
         if (notLastWithDocument) {
-            return widget.closeWithoutSaving(false).then(() => undefined);
+            await widget.closeWithoutSaving(false);
+            return undefined;
         }
         if (options && options.shouldSave) {
             return options.shouldSave();

package/src/browser/saveable.ts

@@ -21,7 +21,7 @@ import { MaybePromise } from '../common/types';
 import { Key } from './keyboard/keys';
 import { AbstractDialog } from './dialogs';
 import { nls } from '../common/nls';
-import { DisposableCollection, isObject } from '../common';
+import { Disposable, DisposableCollection, isObject } from '../common';
 import { BinaryBuffer } from '../common/buffer';
 
 export type AutoSaveMode = 'off' | 'afterDelay' | 'onFocusChange' | 'onWindowChange';
@@ -112,6 +112,74 @@ export class DelegatingSaveable implements Saveable {
 
 }
 
+export class CompositeSaveable implements Saveable {
+    protected isDirty = false;
+    protected readonly onDirtyChangedEmitter = new Emitter<void>();
+    protected readonly onContentChangedEmitter = new Emitter<void>();
+    protected readonly toDispose = new DisposableCollection(this.onDirtyChangedEmitter, this.onContentChangedEmitter);
+    protected readonly saveablesMap = new Map<Saveable, Disposable>();
+
+    get dirty(): boolean {
+        return this.isDirty;
+    }
+
+    get onDirtyChanged(): Event<void> {
+        return this.onDirtyChangedEmitter.event;
+    }
+
+    get onContentChanged(): Event<void> {
+        return this.onContentChangedEmitter.event;
+    }
+
+    async save(options?: SaveOptions): Promise<void> {
+        await Promise.all(this.saveables.map(saveable => saveable.save(options)));
+    }
+
+    async revert(options?: Saveable.RevertOptions): Promise<void> {
+        await Promise.all(this.saveables.map(saveable => saveable.revert?.(options)));
+    }
+
+    get saveables(): readonly Saveable[] {
+        return Array.from(this.saveablesMap.keys());
+    }
+
+    add(saveable: Saveable): void {
+        if (this.saveablesMap.has(saveable)) {
+            return;
+        }
+        const toDispose = new DisposableCollection();
+        this.toDispose.push(toDispose);
+        this.saveablesMap.set(saveable, toDispose);
+        toDispose.push(Disposable.create(() => {
+            this.saveablesMap.delete(saveable);
+        }));
+        toDispose.push(saveable.onDirtyChanged(() => {
+            const wasDirty = this.isDirty;
+            this.isDirty = this.saveables.some(s => s.dirty);
+            if (this.isDirty !== wasDirty) {
+                this.onDirtyChangedEmitter.fire();
+            }
+        }));
+        toDispose.push(saveable.onContentChanged(() => {
+            this.onContentChangedEmitter.fire();
+        }));
+        if (saveable.dirty && !this.isDirty) {
+            this.isDirty = true;
+            this.onDirtyChangedEmitter.fire();
+        }
+    }
+
+    remove(saveable: Saveable): boolean {
+        const toDispose = this.saveablesMap.get(saveable);
+        toDispose?.dispose();
+        return !!toDispose;
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+}
+
 export namespace Saveable {
     export interface RevertOptions {
         /**

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

@@ -15,11 +15,11 @@
 // *****************************************************************************
 
 import { MenuNode, MenuPath } from '../../../common';
-import { NAVIGATION, TabBarToolbarItem } from './tab-bar-toolbar-types';
+import { NAVIGATION, RenderedToolbarItem } from './tab-bar-toolbar-types';
 
 export const TOOLBAR_WRAPPER_ID_SUFFIX = '-as-tabbar-toolbar-item';
 
-export class ToolbarMenuNodeWrapper implements TabBarToolbarItem {
+export class ToolbarMenuNodeWrapper implements RenderedToolbarItem {
     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 ?? ''; };

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

@@ -17,11 +17,11 @@
 import debounce = require('lodash.debounce');
 import { inject, injectable, named } from 'inversify';
 // eslint-disable-next-line max-len
-import { CommandMenuNode, CommandRegistry, CompoundMenuNode, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuNode, MenuPath } from '../../../common';
+import { CommandRegistry, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuNode, MenuPath } from '../../../common';
 import { ContextKeyService } from '../../context-key-service';
 import { FrontendApplicationContribution } from '../../frontend-application-contribution';
 import { Widget } from '../../widgets';
-import { AnyToolbarItem, ConditionalToolbarItem, MenuDelegate, MenuToolbarItem, ReactTabBarToolbarItem, TabBarToolbarItem } from './tab-bar-toolbar-types';
+import { MenuDelegate, ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbarItem } from './tab-bar-toolbar-types';
 import { ToolbarMenuNodeWrapper } from './tab-bar-toolbar-menu-adapters';
 
 /**
@@ -75,7 +75,7 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
      *
      * @param item the item to register.
      */
-    registerItem(item: TabBarToolbarItem | ReactTabBarToolbarItem): Disposable {
+    registerItem(item: RenderedToolbarItem | ReactTabBarToolbarItem): Disposable {
         const { id } = item;
         if (this.items.has(id)) {
             throw new Error(`A toolbar item is already registered with the '${id}' ID.`);
@@ -110,24 +110,17 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
         for (const delegate of this.menuDelegates.values()) {
             if (delegate.isVisible(widget)) {
                 const menu = this.menuRegistry.getMenu(delegate.menuPath);
-                const children = CompoundMenuNode.getFlatChildren(menu.children);
-                for (const child of children) {
+                for (const child of menu.children) {
                     if (!child.when || this.contextKeyService.match(child.when, widget.node)) {
                         if (child.children) {
                             for (const grandchild of child.children) {
                                 if (!grandchild.when || this.contextKeyService.match(grandchild.when, widget.node)) {
-                                    if (CommandMenuNode.is(grandchild)) {
-                                        result.push(new ToolbarMenuNodeWrapper(grandchild, child.id, delegate.menuPath));
-                                    } else if (CompoundMenuNode.is(grandchild)) {
-                                        let menuPath;
-                                        if (menuPath = this.menuRegistry.getPath(grandchild)) {
-                                            result.push(new ToolbarMenuNodeWrapper(grandchild, child.id, menuPath));
-                                        }
-                                    }
+                                    const menuPath = this.menuRegistry.getPath(grandchild);
+                                    result.push(new ToolbarMenuNodeWrapper(grandchild, child.id, menuPath));
                                 }
                             }
                         } else if (child.command) {
-                            result.push(new ToolbarMenuNodeWrapper(child, '', delegate.menuPath));
+                            result.push(new ToolbarMenuNodeWrapper(child, ''));
                         }
                     }
                 }
@@ -145,15 +138,17 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
      * @returns `false` if the `item` should be suppressed, otherwise `true`
      */
     protected isItemVisible(item: TabBarToolbarItem | ReactTabBarToolbarItem, widget: Widget): boolean {
-        if (TabBarToolbarItem.is(item) && item.command && !this.isTabBarToolbarItemVisible(item, widget)) {
+        if (!this.isConditionalItemVisible(item, widget)) {
             return false;
         }
-        if (MenuToolbarItem.is(item) && !this.isMenuToolbarItemVisible(item, widget)) {
+
+        if (item.command && !this.commandRegistry.isVisible(item.command, widget)) {
             return false;
         }
-        if (AnyToolbarItem.isConditional(item) && !this.isConditionalItemVisible(item, widget)) {
+        if (item.menuPath && !this.isNonEmptyMenu(item, widget)) {
             return false;
         }
+
         // The item is not vetoed. Accept it
         return true;
     }
@@ -166,7 +161,7 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
      * @param widget the widget that is updating the toolbar
      * @returns `false` if the `item` should be suppressed, otherwise `true`
      */
-    protected isConditionalItemVisible(item: ConditionalToolbarItem, widget: Widget): boolean {
+    protected isConditionalItemVisible(item: TabBarToolbarItem, widget: Widget): boolean {
         if (item.isVisible && !item.isVisible(widget)) {
             return false;
         }
@@ -176,19 +171,6 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
         return true;
     }
 
-    /**
-     * Query whether a tab-bar toolbar `item` that has a command should be shown in the toolbar.
-     * This implementation returns `false` if the `item`'s command is not visible in the
-     * `widget` according to the command registry.
-     *
-     * @param item a tab-bar toolbar item that has a non-empty `command`
-     * @param widget the widget that is updating the toolbar
-     * @returns `false` if the `item` should be suppressed, otherwise `true`
-     */
-    protected isTabBarToolbarItemVisible(item: TabBarToolbarItem, widget: Widget): boolean {
-        return this.commandRegistry.isVisible(item.command, widget);
-    }
-
     /**
      * Query whether a menu toolbar `item` should be shown in the toolbar.
      * This implementation returns `false` if the `item` does not have any actual menu to show.
@@ -197,7 +179,10 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
      * @param widget the widget that is updating the toolbar
      * @returns `false` if the `item` should be suppressed, otherwise `true`
      */
-    protected isMenuToolbarItemVisible(item: MenuToolbarItem, widget: Widget): boolean {
+    isNonEmptyMenu(item: TabBarToolbarItem, widget: Widget | undefined): boolean {
+        if (!item.menuPath) {
+            return false;
+        }
         const menu = this.menuRegistry.getMenu(item.menuPath);
         const isVisible: (node: MenuNode) => boolean = node =>
             node.children?.length
@@ -220,7 +205,7 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
         }
     }
 
-    registerMenuDelegate(menuPath: MenuPath, when?: string | ((widget: Widget) => boolean)): Disposable {
+    registerMenuDelegate(menuPath: MenuPath, when?: ((widget: Widget) => boolean)): Disposable {
         const id = this.toElementId(menuPath);
         if (!this.menuDelegates.has(id)) {
             const isVisible: MenuDelegate['isVisible'] = !when