@theia/core 1.53.0-next.4 → 1.53.0-next.55

package/lib/browser/saveable.js

@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShouldSaveDialog = exports.setDirty = exports.SaveReason = exports.SaveableWidget = exports.close = exports.Saveable = exports.DelegatingSaveable = void 0;
+exports.ShouldSaveDialog = exports.setDirty = exports.SaveReason = exports.SaveableWidget = exports.close = exports.Saveable = exports.CompositeSaveable = exports.DelegatingSaveable = void 0;
 const event_1 = require("../common/event");
 const keys_1 = require("./keyboard/keys");
 const dialogs_1 = require("./dialogs");
@@ -61,6 +61,67 @@ class DelegatingSaveable {
     }
 }
 exports.DelegatingSaveable = DelegatingSaveable;
+class CompositeSaveable {
+    constructor() {
+        this.isDirty = false;
+        this.onDirtyChangedEmitter = new event_1.Emitter();
+        this.onContentChangedEmitter = new event_1.Emitter();
+        this.toDispose = new common_1.DisposableCollection(this.onDirtyChangedEmitter, this.onContentChangedEmitter);
+        this.saveablesMap = new Map();
+    }
+    get dirty() {
+        return this.isDirty;
+    }
+    get onDirtyChanged() {
+        return this.onDirtyChangedEmitter.event;
+    }
+    get onContentChanged() {
+        return this.onContentChangedEmitter.event;
+    }
+    async save(options) {
+        await Promise.all(this.saveables.map(saveable => saveable.save(options)));
+    }
+    async revert(options) {
+        await Promise.all(this.saveables.map(saveable => { var _a; return (_a = saveable.revert) === null || _a === void 0 ? void 0 : _a.call(saveable, options); }));
+    }
+    get saveables() {
+        return Array.from(this.saveablesMap.keys());
+    }
+    add(saveable) {
+        if (this.saveablesMap.has(saveable)) {
+            return;
+        }
+        const toDispose = new common_1.DisposableCollection();
+        this.toDispose.push(toDispose);
+        this.saveablesMap.set(saveable, toDispose);
+        toDispose.push(common_1.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) {
+        const toDispose = this.saveablesMap.get(saveable);
+        toDispose === null || toDispose === void 0 ? void 0 : toDispose.dispose();
+        return !!toDispose;
+    }
+    dispose() {
+        this.toDispose.dispose();
+    }
+}
+exports.CompositeSaveable = CompositeSaveable;
 var Saveable;
 (function (Saveable) {
     let Snapshot;

package/lib/browser/saveable.js.map

@@ -1 +1 @@
-{"version":3,"file":"saveable.js","sourceRoot":"","sources":["../../src/browser/saveable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"saveable.js","sourceRoot":"","sources":["../../src/browser/saveable.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,12 @@
 import { MenuNode, MenuPath } from '../../../common';
-import { TabBarToolbarItem } from './tab-bar-toolbar-types';
+import { RenderedToolbarItem } from './tab-bar-toolbar-types';
 export declare const TOOLBAR_WRAPPER_ID_SUFFIX = "-as-tabbar-toolbar-item";
-export declare class ToolbarMenuNodeWrapper implements TabBarToolbarItem {
+export declare class ToolbarMenuNodeWrapper implements RenderedToolbarItem {
     protected readonly menuNode: MenuNode;
-    readonly group?: string | undefined;
+    readonly group: string | undefined;
+    readonly delegateMenuPath: MenuPath;
     readonly menuPath?: MenuPath | undefined;
-    constructor(menuNode: MenuNode, group?: string | undefined, menuPath?: MenuPath | undefined);
+    constructor(menuNode: MenuNode, group: string | undefined, delegateMenuPath: MenuPath, menuPath?: MenuPath | undefined);
     get id(): string;
     get command(): string;
     get icon(): string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-menu-adapters.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAc,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAExE,eAAO,MAAM,yBAAyB,4BAA4B,CAAC;AAEnE,qBAAa,sBAAuB,YAAW,iBAAiB;IAChD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAAE,QAAQ,CAAC,KAAK,CAAC;IAAU,QAAQ,CAAC,QAAQ,CAAC;gBAA/D,QAAQ,EAAE,QAAQ,EAAW,KAAK,CAAC,oBAAQ,EAAW,QAAQ,CAAC,sBAAU;IACxG,IAAI,EAAE,IAAI,MAAM,CAAyD;IACzE,IAAI,OAAO,IAAI,MAAM,CAAwC;IAC7D,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA+B;IAC7D,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAAgC;IACjE,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA+B;IAC7D,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAAsG;CACvI"}
+{"version":3,"file":"tab-bar-toolbar-menu-adapters.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAc,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE1E,eAAO,MAAM,yBAAyB,4BAA4B,CAAC;AAEnE,qBAAa,sBAAuB,YAAW,mBAAmB;IAClD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS;IAAE,QAAQ,CAAC,gBAAgB,EAAE,QAAQ;IAAE,QAAQ,CAAC,QAAQ,CAAC;gBAA/G,QAAQ,EAAE,QAAQ,EAAW,KAAK,EAAE,MAAM,GAAG,SAAS,EAAW,gBAAgB,EAAE,QAAQ,EAAW,QAAQ,CAAC,sBAAU;IACxJ,IAAI,EAAE,IAAI,MAAM,CAAyD;IACzE,IAAI,OAAO,IAAI,MAAM,CAAwC;IAC7D,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA+B;IAC7D,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAAgC;IACjE,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAA+B;IAC7D,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAAsG;CACvI"}

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js

@@ -19,9 +19,10 @@ exports.ToolbarMenuNodeWrapper = exports.TOOLBAR_WRAPPER_ID_SUFFIX = void 0;
 const tab_bar_toolbar_types_1 = require("./tab-bar-toolbar-types");
 exports.TOOLBAR_WRAPPER_ID_SUFFIX = '-as-tabbar-toolbar-item';
 class ToolbarMenuNodeWrapper {
-    constructor(menuNode, group, menuPath) {
+    constructor(menuNode, group, delegateMenuPath, menuPath) {
         this.menuNode = menuNode;
         this.group = group;
+        this.delegateMenuPath = delegateMenuPath;
         this.menuPath = menuPath;
     }
     get id() { return this.menuNode.id + exports.TOOLBAR_WRAPPER_ID_SUFFIX; }

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-menu-adapters.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.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;;;AAGhF,mEAAwE;AAE3D,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AAEnE,MAAa,sBAAsB;IAC/B,YAA+B,QAAkB,EAAW,KAAc,EAAW,QAAmB;QAAzE,aAAQ,GAAR,QAAQ,CAAU;QAAW,UAAK,GAAL,KAAK,CAAS;QAAW,aAAQ,GAAR,QAAQ,CAAW;IAAI,CAAC;IAC7G,IAAI,EAAE,KAAa,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,iCAAyB,CAAC,CAAC,CAAC;IACzE,IAAI,OAAO,aAAa,OAAO,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,CAAC;IAAA,CAAC;IAC9D,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,IAAI,OAAO,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,IAAI,IAAI,KAAyB,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,kCAAU,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;CACvI;AARD,wDAQC"}
+{"version":3,"file":"tab-bar-toolbar-menu-adapters.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.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;;;AAGhF,mEAA0E;AAE7D,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AAEnE,MAAa,sBAAsB;IAC/B,YAA+B,QAAkB,EAAW,KAAyB,EAAW,gBAA0B,EAAW,QAAmB;QAAzH,aAAQ,GAAR,QAAQ,CAAU;QAAW,UAAK,GAAL,KAAK,CAAoB;QAAW,qBAAgB,GAAhB,gBAAgB,CAAU;QAAW,aAAQ,GAAR,QAAQ,CAAW;IAAI,CAAC;IAC7J,IAAI,EAAE,KAAa,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,iCAAyB,CAAC,CAAC,CAAC;IACzE,IAAI,OAAO,aAAa,OAAO,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,CAAC;IAAA,CAAC;IAC9D,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,IAAI,OAAO,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,IAAI,IAAI,KAAyB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,IAAI,IAAI,KAAyB,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,kCAAU,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;CACvI;AARD,wDAQC"}

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

@@ -3,7 +3,7 @@ import { CommandRegistry, ContributionProvider, Disposable, Emitter, Event, Menu
 import { ContextKeyService } from '../../context-key-service';
 import { FrontendApplicationContribution } from '../../frontend-application-contribution';
 import { Widget } from '../../widgets';
-import { ConditionalToolbarItem, MenuDelegate, MenuToolbarItem, ReactTabBarToolbarItem, TabBarToolbarItem } from './tab-bar-toolbar-types';
+import { MenuDelegate, ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbarItem } from './tab-bar-toolbar-types';
 /**
  * Clients should implement this interface if they want to contribute to the tab-bar toolbar.
  */
@@ -22,7 +22,7 @@ export interface TabBarToolbarContribution {
  * Main, shared registry for tab-bar toolbar items.
  */
 export declare class TabBarToolbarRegistry implements FrontendApplicationContribution {
-    protected items: Map<string, TabBarToolbarItem | ReactTabBarToolbarItem>;
+    protected items: Map<string, TabBarToolbarItem>;
     protected menuDelegates: Map<string, MenuDelegate>;
     protected readonly commandRegistry: CommandRegistry;
     protected readonly contextKeyService: ContextKeyService;
@@ -37,7 +37,7 @@ export declare class TabBarToolbarRegistry implements FrontendApplicationContrib
      *
      * @param item the item to register.
      */
-    registerItem(item: TabBarToolbarItem | ReactTabBarToolbarItem): Disposable;
+    registerItem(item: RenderedToolbarItem | ReactTabBarToolbarItem): Disposable;
     /**
      * Returns an array of tab-bar toolbar items which are visible when the `widget` argument is the current one.
      *
@@ -61,17 +61,7 @@ export declare class TabBarToolbarRegistry implements FrontendApplicationContrib
      * @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;
-    /**
-     * 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;
+    protected isConditionalItemVisible(item: TabBarToolbarItem, widget: Widget): boolean;
     /**
      * 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.
@@ -80,9 +70,9 @@ export declare class TabBarToolbarRegistry implements FrontendApplicationContrib
      * @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;
     unregisterItem(itemOrId: TabBarToolbarItem | ReactTabBarToolbarItem | string): void;
-    registerMenuDelegate(menuPath: MenuPath, when?: string | ((widget: Widget) => boolean)): Disposable;
+    registerMenuDelegate(menuPath: MenuPath, when?: ((widget: Widget) => boolean)): Disposable;
     unregisterMenuDelegate(menuPath: MenuPath): void;
     /**
      * Generate a single ID string from a menu path that

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

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-registry.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAmB,eAAe,EAAoB,oBAAoB,EAAE,UAAU,EAAwB,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpM,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAkB,sBAAsB,EAAE,YAAY,EAAE,eAAe,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG3J;;GAEG;AACH,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC/D;AAKD;;GAEG;AACH,qBACa,qBAAsB,YAAW,+BAA+B;IAEzE,SAAS,CAAC,KAAK,0DAAiE;IAChF,SAAS,CAAC,aAAa,4BAAmC;IAEjC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAG9E,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiC;IAElE,SAAS,CAAC,eAAe,4CAA8D;IAEvF,OAAO,IAAI,IAAI;IAOf;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,iBAAiB,GAAG,sBAAsB,GAAG,UAAU;IAiB1E;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;IAuC/E;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,sBAAsB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAclG;;;;;;;OAOG;IACH,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAUzF;;;;;;;;OAQG;IACH,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItF;;;;;;;OAOG;IACH,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAgBlF,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,sBAAsB,GAAG,MAAM,GAAG,IAAI;IAOnF,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,UAAU;IAgBnG,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAMhD;;;;;;OAMG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;CAI1C"}
+{"version":3,"file":"tab-bar-toolbar-registry.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,UAAU,EAAwB,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACjK,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGvH;;GAEG;AACH,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;;OAGG;IACH,oBAAoB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC/D;AAKD;;GAEG;AACH,qBACa,qBAAsB,YAAW,+BAA+B;IAEzE,SAAS,CAAC,KAAK,iCAAiE;IAChF,SAAS,CAAC,aAAa,4BAAmC;IAEjC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IAG9E,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,yBAAyB,CAAC,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiC;IAElE,SAAS,CAAC,eAAe,4CAA8D;IAEvF,OAAO,IAAI,IAAI;IAOf;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,sBAAsB,GAAG,UAAU;IAiB5E;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;IAiC/E;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,sBAAsB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAgBlG;;;;;;;OAOG;IACH,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAUpF;;;;;;;OAOG;IACH,cAAc,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAmB5E,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,sBAAsB,GAAG,MAAM,GAAG,IAAI;IAOnF,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,UAAU;IAgB1F,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAMhD;;;;;;OAMG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM;CAI1C"}

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js

@@ -22,7 +22,6 @@ const inversify_1 = require("inversify");
 // eslint-disable-next-line max-len
 const common_1 = require("../../../common");
 const context_key_service_1 = require("../../context-key-service");
-const tab_bar_toolbar_types_1 = require("./tab-bar-toolbar-types");
 const tab_bar_toolbar_menu_adapters_1 = require("./tab-bar-toolbar-menu-adapters");
 /**
  * Clients should implement this interface if they want to contribute to the tab-bar toolbar.
@@ -84,26 +83,19 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
         for (const delegate of this.menuDelegates.values()) {
             if (delegate.isVisible(widget)) {
                 const menu = this.menuRegistry.getMenu(delegate.menuPath);
-                const children = common_1.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 (common_1.CommandMenuNode.is(grandchild)) {
-                                        result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(grandchild, child.id, delegate.menuPath));
-                                    }
-                                    else if (common_1.CompoundMenuNode.is(grandchild)) {
-                                        let menuPath;
-                                        if (menuPath = this.menuRegistry.getPath(grandchild)) {
-                                            result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(grandchild, child.id, menuPath));
-                                        }
-                                    }
+                                    const menuPath = this.menuRegistry.getPath(grandchild);
+                                    result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(grandchild, child.id, delegate.menuPath, menuPath));
                                 }
                             }
                         }
                         else if (child.command) {
-                            result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(child, '', delegate.menuPath));
+                            const menuPath = this.menuRegistry.getPath(child);
+                            result.push(new tab_bar_toolbar_menu_adapters_1.ToolbarMenuNodeWrapper(child, undefined, delegate.menuPath, menuPath));
                         }
                     }
                 }
@@ -120,13 +112,13 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
      * @returns `false` if the `item` should be suppressed, otherwise `true`
      */
     isItemVisible(item, widget) {
-        if (tab_bar_toolbar_types_1.TabBarToolbarItem.is(item) && item.command && !this.isTabBarToolbarItemVisible(item, widget)) {
+        if (!this.isConditionalItemVisible(item, widget)) {
             return false;
         }
-        if (tab_bar_toolbar_types_1.MenuToolbarItem.is(item) && !this.isMenuToolbarItemVisible(item, widget)) {
+        if (item.command && !this.commandRegistry.isVisible(item.command, widget)) {
             return false;
         }
-        if (tab_bar_toolbar_types_1.AnyToolbarItem.isConditional(item) && !this.isConditionalItemVisible(item, widget)) {
+        if (item.menuPath && !this.isNonEmptyMenu(item, widget)) {
             return false;
         }
         // The item is not vetoed. Accept it
@@ -149,18 +141,6 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
         }
         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`
-     */
-    isTabBarToolbarItemVisible(item, widget) {
-        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.
@@ -169,7 +149,10 @@ let TabBarToolbarRegistry = class TabBarToolbarRegistry {
      * @param widget the widget that is updating the toolbar
      * @returns `false` if the `item` should be suppressed, otherwise `true`
      */
-    isMenuToolbarItemVisible(item, widget) {
+    isNonEmptyMenu(item, widget) {
+        if (!item.menuPath) {
+            return false;
+        }
         const menu = this.menuRegistry.getMenu(item.menuPath);
         const isVisible = node => {
             var _a, _b;

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js.map

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

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

@@ -10,51 +10,19 @@ export interface TabBarDelegator extends Widget {
 export declare namespace TabBarDelegator {
     function is(candidate?: Widget): candidate is TabBarDelegator;
 }
-interface RegisteredToolbarItem {
+export type TabBarToolbarItem = RenderedToolbarItem | ReactTabBarToolbarItem;
+/**
+ * Representation of an item in the tab
+ */
+export interface TabBarToolbarItemBase {
     /**
      * The unique ID of the toolbar item.
      */
     id: string;
-}
-interface RenderedToolbarItem {
-    /**
-     * Optional icon for the item.
-     */
-    icon?: string | (() => string);
-    /**
-     * Optional text of the item.
-     *
-     * Strings in the format `$(iconIdentifier~animationType) will be treated as icon references.
-     * If the iconIdentifier begins with fa-, Font Awesome icons will be used; otherwise it will be treated as Codicon name.
-     *
-     * You can find Codicon classnames here: https://microsoft.github.io/vscode-codicons/dist/codicon.html
-     * You can find Font Awesome classnames here: http://fontawesome.io/icons/
-     * The type of animation can be either `spin` or `pulse`.
-     */
-    text?: string;
-    /**
-     * Optional tooltip for the item.
-     */
-    tooltip?: string;
-}
-interface SelfRenderingToolbarItem {
-    render(widget?: Widget): React.ReactNode;
-}
-interface ExecutableToolbarItem {
     /**
      * The command to execute when the item is selected.
      */
-    command: string;
-}
-export interface MenuToolbarItem {
-    /**
-     * A menu path with which this item is associated.
-     * If accompanied by a command, this data will be passed to the {@link MenuCommandExecutor}.
-     * If no command is present, this menu will be opened.
-     */
-    menuPath: MenuPath;
-}
-export interface ConditionalToolbarItem {
+    command?: string;
     /**
      * https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts
      */
@@ -69,69 +37,66 @@ export interface ConditionalToolbarItem {
      * Note: currently, each item of the container toolbar will be re-rendered if any of the items have changed.
      */
     onDidChange?: Event<void>;
-}
-interface InlineToolbarItemMetadata {
     /**
      * 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.
      */
     priority?: number;
-    group: 'navigation' | undefined;
-}
-interface MenuToolbarItemMetadata {
+    group?: string;
     /**
-     * Optional group for the item. Default `navigation`.
-     * `navigation` group will be inlined, while all the others will appear in 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`.
+     * A menu path with which this item is associated.
+     * If accompanied by a command, this data will be passed to the {@link MenuCommandExecutor}.
+     * If no command is present, this menu will be opened.
      */
-    group: string;
+    menuPath?: MenuPath;
+    /**
+     * The path of the menu delegate that contributed this toolbar item
+     */
+    delegateMenuPath?: MenuPath;
+    contextKeyOverlays?: Record<string, string>;
     /**
      * Optional ordering string for placing the item within its group
      */
     order?: string;
 }
-/**
- * Representation of an item in the tab
- */
-export interface TabBarToolbarItem extends RegisteredToolbarItem, ExecutableToolbarItem, RenderedToolbarItem, Omit<ConditionalToolbarItem, 'isVisible'>, Pick<InlineToolbarItemMetadata, 'priority'>, Partial<MenuToolbarItem>, Partial<MenuToolbarItemMetadata> {
+export interface RenderedToolbarItem extends TabBarToolbarItemBase {
+    /**
+     * Optional icon for the item.
+     */
+    icon?: string | (() => string);
+    /**
+     * Optional text of the item.
+     *
+     * Strings in the format `$(iconIdentifier~animationType) will be treated as icon references.
+     * If the iconIdentifier begins with fa-, Font Awesome icons will be used; otherwise it will be treated as Codicon name.
+     *
+     * You can find Codicon classnames here: https://microsoft.github.io/vscode-codicons/dist/codicon.html
+     * You can find Font Awesome classnames here: http://fontawesome.io/icons/
+     * The type of animation can be either `spin` or `pulse`.
+     */
+    text?: string;
+    /**
+     * Optional tooltip for the item.
+     */
+    tooltip?: string;
 }
 /**
  * Tab-bar toolbar item backed by a `React.ReactNode`.
  * Unlike the `TabBarToolbarItem`, this item is not connected to the command service.
  */
-export interface ReactTabBarToolbarItem extends RegisteredToolbarItem, SelfRenderingToolbarItem, ConditionalToolbarItem, Pick<InlineToolbarItemMetadata, 'priority'>, Pick<Partial<MenuToolbarItemMetadata>, 'group'> {
+export interface ReactTabBarToolbarItem extends TabBarToolbarItemBase {
+    render(widget?: Widget): React.ReactNode;
 }
-export interface AnyToolbarItem extends RegisteredToolbarItem, Partial<ExecutableToolbarItem>, Partial<RenderedToolbarItem>, Partial<SelfRenderingToolbarItem>, Partial<ConditionalToolbarItem>, Partial<MenuToolbarItem>, Pick<InlineToolbarItemMetadata, 'priority'>, Partial<MenuToolbarItemMetadata> {
+export declare namespace ReactTabBarToolbarItem {
+    function is(item: TabBarToolbarItem): item is ReactTabBarToolbarItem;
 }
-export interface MenuDelegate extends MenuToolbarItem, Required<Pick<ConditionalToolbarItem, 'isVisible'>> {
+export interface MenuDelegate {
+    menuPath: MenuPath;
+    isVisible(widget?: Widget): boolean;
 }
 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: unknown): arg is TabBarToolbarItem;
-}
-export declare namespace MenuToolbarItem {
-    /**
-     * Type guard for a toolbar item that actually is a menu item, amongst
-     * the other kinds of item that it may also be.
-     *
-     * @param item a toolbar item
-     * @returns whether the `item` is a menu item
-     */
-    function is<T extends AnyToolbarItem>(item: T): item is T & MenuToolbarItem;
-    function getMenuPath(item: AnyToolbarItem): MenuPath | undefined;
-}
-export declare namespace AnyToolbarItem {
-    /**
-     * Type guard for a toolbar item that actually manifests any of the
-     * features of a conditional toolbar item.
-     *
-     * @param item a toolbar item
-     * @returns whether the `item` is a conditional item
-     */
-    function isConditional<T extends AnyToolbarItem>(item: T): item is T & ConditionalToolbarItem;
 }
-export {};
 //# sourceMappingURL=tab-bar-toolbar-types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-types.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tab-bar-toolbar-types.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAc,KAAK,EAAwB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,yEAAyE;AACzE,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAmC,CAAC;AAE7E,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC3C,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAAC;CAC3C;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,IAAI,eAAe,CAEnE;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,sBAAsB,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrC;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAC9D;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAE/B;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACjE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;CAC5C;AAED,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,EAAE,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,IAAI,sBAAsB,CAE1E;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAED,yBAAiB,iBAAiB,CAAC;IAE/B;;OAEG;IACI,MAAM,mBAAmB,SAAU,iBAAiB,SAAS,iBAAiB,WAapF,CAAC;CACL"}

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.js

@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnyToolbarItem = exports.MenuToolbarItem = exports.TabBarToolbarItem = exports.TabBarDelegator = exports.TAB_BAR_TOOLBAR_CONTEXT_MENU = exports.NAVIGATION = void 0;
+exports.TabBarToolbarItem = exports.ReactTabBarToolbarItem = exports.TabBarDelegator = exports.TAB_BAR_TOOLBAR_CONTEXT_MENU = exports.NAVIGATION = void 0;
 const common_1 = require("../../../common");
 /** Items whose group is exactly 'navigation' will be rendered inline. */
 exports.NAVIGATION = 'navigation';
@@ -27,6 +27,13 @@ var TabBarDelegator;
     }
     TabBarDelegator.is = is;
 })(TabBarDelegator || (exports.TabBarDelegator = TabBarDelegator = {}));
+var ReactTabBarToolbarItem;
+(function (ReactTabBarToolbarItem) {
+    function is(item) {
+        return (0, common_1.isObject)(item) && typeof item.render === 'function';
+    }
+    ReactTabBarToolbarItem.is = is;
+})(ReactTabBarToolbarItem || (exports.ReactTabBarToolbarItem = ReactTabBarToolbarItem = {}));
 var TabBarToolbarItem;
 (function (TabBarToolbarItem) {
     /**
@@ -47,43 +54,5 @@ var TabBarToolbarItem;
         }
         return (left.priority || 0) - (right.priority || 0);
     };
-    function is(arg) {
-        return (0, common_1.isObject)(arg) && (0, common_1.isString)(arg.command);
-    }
-    TabBarToolbarItem.is = is;
 })(TabBarToolbarItem || (exports.TabBarToolbarItem = TabBarToolbarItem = {}));
-var MenuToolbarItem;
-(function (MenuToolbarItem) {
-    /**
-     * Type guard for a toolbar item that actually is a menu item, amongst
-     * the other kinds of item that it may also be.
-     *
-     * @param item a toolbar item
-     * @returns whether the `item` is a menu item
-     */
-    function is(item) {
-        return Array.isArray(item.menuPath);
-    }
-    MenuToolbarItem.is = is;
-    function getMenuPath(item) {
-        return Array.isArray(item.menuPath) ? item.menuPath : undefined;
-    }
-    MenuToolbarItem.getMenuPath = getMenuPath;
-})(MenuToolbarItem || (exports.MenuToolbarItem = MenuToolbarItem = {}));
-var AnyToolbarItem;
-(function (AnyToolbarItem) {
-    /**
-     * Type guard for a toolbar item that actually manifests any of the
-     * features of a conditional toolbar item.
-     *
-     * @param item a toolbar item
-     * @returns whether the `item` is a conditional item
-     */
-    function isConditional(item) {
-        return 'isVisible' in item && typeof item.isVisible === 'function'
-            || 'onDidChange' in item && typeof item.onDidChange === 'function'
-            || 'when' in item && typeof item.when === 'string';
-    }
-    AnyToolbarItem.isConditional = isConditional;
-})(AnyToolbarItem || (exports.AnyToolbarItem = AnyToolbarItem = {}));
 //# sourceMappingURL=tab-bar-toolbar-types.js.map

package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar-toolbar-types.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tab-bar-toolbar-types.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.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;;;AAGhF,4CAAoF;AAGpF,yEAAyE;AAC5D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,4BAA4B,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAM7E,IAAiB,eAAe,CAI/B;AAJD,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,SAAkB;QACjC,OAAO,IAAA,iBAAQ,EAAkB,SAAS,CAAC,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;IAFe,kBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,eAAe,+BAAf,eAAe,QAI/B;AAsFD,IAAiB,sBAAsB,CAItC;AAJD,WAAiB,sBAAsB;IACnC,SAAgB,EAAE,CAAC,IAAuB;QACtC,OAAO,IAAA,iBAAQ,EAAyB,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC;IACvF,CAAC;IAFe,yBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,sBAAsB,sCAAtB,sBAAsB,QAItC;AAOD,IAAiB,iBAAiB,CAmBjC;AAnBD,WAAiB,iBAAiB;IAE9B;;OAEG;IACU,qCAAmB,GAAG,CAAC,IAAuB,EAAE,KAAwB,EAAE,EAAE;;QACrF,MAAM,SAAS,GAAW,MAAA,IAAI,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACnD,MAAM,UAAU,GAAW,MAAA,KAAK,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACrD,IAAI,SAAS,KAAK,kBAAU,IAAI,UAAU,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,kBAAU,IAAI,SAAS,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC;AACN,CAAC,EAnBgB,iBAAiB,iCAAjB,iBAAiB,QAmBjC"}