@codingame/monaco-vscode-view-title-bar-service-override 31.0.0 → 32.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-title-bar-service-override",
-  "version": "31.0.0",
+  "version": "32.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-title-bar service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "31.0.0"
+    "@codingame/monaco-vscode-api": "32.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/browser/parts/titlebar/commandCenterControl.js

@@ -208,13 +208,13 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
                                 label = that._windowTitle.fileName ?? label;
                             }
                             if (!label) {
-                                label = ( localize(3724, "Search"));
+                                label = ( localize(3768, "Search"));
                             }
                             if (prefix) {
-                                label = ( localize(3725, "{0} {1}", prefix, label));
+                                label = ( localize(3769, "{0} {1}", prefix, label));
                             }
                             if (suffix) {
-                                label = ( localize(3726, "{0} {1}", label, suffix));
+                                label = ( localize(3770, "{0} {1}", label, suffix));
                             }
                             return label.replaceAll(/\r\n|\r|\n/g, "⏎");
                         }
@@ -235,13 +235,13 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
     getTooltip() {
         const kb = this._keybindingService.lookupKeybinding(this.action.id)?.getLabel();
         const title = kb ? ( localize(
-            3727,
+            3771,
             "Search {0} ({1}) — {2}",
             this._windowTitle.workspaceName,
             kb,
             this._windowTitle.value
         )) : ( localize(
-            3728,
+            3772,
             "Search {0} — {1}",
             this._windowTitle.workspaceName,
             this._windowTitle.value
@@ -252,7 +252,7 @@ let CommandCenterCenterViewItem = class CommandCenterCenterViewItem extends Base
 CommandCenterCenterViewItem = CommandCenterCenterViewItem_1 = ( __decorate([( __param(3, IHoverService)), ( __param(4, IKeybindingService)), ( __param(5, IInstantiationService)), ( __param(6, IEditorGroupsService)), ( __param(7, IConfigurationService))], CommandCenterCenterViewItem));
 MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
     submenu: MenuId.CommandCenterCenter,
-    title: ( localize(3729, "Command Center")),
+    title: ( localize(3773, "Command Center")),
     icon: Codicon.shield,
     order: 101
 });

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.d.ts

@@ -16,6 +16,7 @@ import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
+import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service";
 import { IEditorGroupsContainer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
@@ -71,6 +72,7 @@ export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     private readonly hostService;
     private readonly menuService;
     private readonly keybindingService;
+    private readonly actionViewItemService;
     readonly minimumWidth: number;
     readonly maximumWidth: number;
     get minimumHeight(): number;
@@ -111,7 +113,7 @@ export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     private readonly isCompactContextKey;
     private readonly windowTitle;
     protected readonly instantiationService: IInstantiationService;
-    constructor(id: string, targetWindow: CodeWindow, editorGroupsContainer: IEditorGroupsContainer, contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService);
+    constructor(id: string, targetWindow: CodeWindow, editorGroupsContainer: IEditorGroupsContainer, contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService, actionViewItemService: IActionViewItemService);
     private registerListeners;
     private onBlur;
     private onFocus;
@@ -149,7 +151,7 @@ export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     dispose(): void;
 }
 export declare class MainBrowserTitlebarPart extends BrowserTitlebarPart {
-    constructor(contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorGroupService: IEditorGroupsService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService);
+    constructor(contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorGroupService: IEditorGroupsService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService, actionViewItemService: IActionViewItemService);
 }
 export interface IAuxiliaryTitlebarPart extends ITitlebarPart, IView {
     readonly container: HTMLElement;
@@ -163,6 +165,6 @@ export declare class AuxiliaryBrowserTitlebarPart extends BrowserTitlebarPart im
     private readonly mainTitlebar;
     private static COUNTER;
     get height(): number;
-    constructor(container: HTMLElement, editorGroupsContainer: IEditorGroupsContainer, mainTitlebar: BrowserTitlebarPart, contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorGroupService: IEditorGroupsService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService);
+    constructor(container: HTMLElement, editorGroupsContainer: IEditorGroupsContainer, mainTitlebar: BrowserTitlebarPart, contextMenuService: IContextMenuService, configurationService: IConfigurationService, environmentService: IBrowserWorkbenchEnvironmentService, instantiationService: IInstantiationService, themeService: IThemeService, storageService: IStorageService, layoutService: IWorkbenchLayoutService, contextKeyService: IContextKeyService, hostService: IHostService, editorGroupService: IEditorGroupsService, editorService: IEditorService, menuService: IMenuService, keybindingService: IKeybindingService, actionViewItemService: IActionViewItemService);
     get preventZoom(): boolean;
 }

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.js

@@ -32,6 +32,7 @@ import { WindowTitle } from '@codingame/monaco-vscode-api/vscode/vs/workbench/br
 import { CommandCenterControl } from './commandCenterControl.js';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { MenuWorkbenchToolBar, HiddenItemStrategy, WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
+import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
 import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/activity';
 import { SimpleGlobalActivityActionViewItem, SimpleAccountActivityActionViewItem, isAccountsActionVisible, AccountsActivityActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/globalCompositeBar';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
@@ -45,7 +46,7 @@ import { EditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/bro
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { EditorCommandsContextActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorTabsControl';
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
-import { ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/titlebar/titlebarActions';
+import { TitleBarLeadingActionsGroup, ACCOUNTS_ACTIVITY_TILE_ACTION, GLOBAL_ACTIVITY_TITLE_ACTION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/titlebar/titlebarActions';
 import { createInstantHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { safeIntl } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
@@ -76,7 +77,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
             constructor() {
                 super({
                     id: `workbench.action.focusTitleBar`,
-                    title: ( localize2(3765, "Focus Title Bar")),
+                    title: ( localize2(3809, "Focus Title Bar")),
                     category: Categories.View,
                     f1: true,
                     precondition: TitleBarVisibleContext
@@ -192,7 +193,8 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         hostService,
         editorService,
         menuService,
-        keybindingService
+        keybindingService,
+        actionViewItemService
     ) {
         super(id, {
             hasTitle: false
@@ -206,6 +208,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         this.hostService = hostService;
         this.menuService = menuService;
         this.keybindingService = keybindingService;
+        this.actionViewItemService = actionViewItemService;
         this.minimumWidth = 0;
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this._onMenubarVisibilityChange = this._register(( new Emitter()));
@@ -450,6 +453,20 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         }
     }
     actionViewItemProvider(action, options) {
+        for (const menuId of [MenuId.TitleBar, MenuId.LayoutControlMenu]) {
+            const customViewItem = this.actionViewItemService.lookUp(menuId, action.id);
+            if (customViewItem) {
+                const result = customViewItem(
+                    action,
+                    options,
+                    this.instantiationService,
+                    getWindowId(this.element ? getWindow(this.element) : mainWindow)
+                );
+                if (result) {
+                    return result;
+                }
+            }
+        }
         if (!this.isAuxiliary) {
             if (action.id === GLOBAL_ACTIVITY_ID) {
                 return this.instantiationService.createInstance(SimpleGlobalActivityActionViewItem, {
@@ -484,7 +501,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
             this.instantiationService.createInstance(WorkbenchToolBar, this.actionToolBarElement, {
                 contextMenu: MenuId.TitleBarContext,
                 orientation: ActionsOrientation.HORIZONTAL,
-                ariaLabel: ( localize(3766, "Title actions")),
+                ariaLabel: ( localize(3810, "Title actions")),
                 getKeyBinding: action => this.getKeybinding(action),
                 overflowBehavior: {
                     maxItems: 9,
@@ -536,6 +553,18 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                     this.editorActionsChangeDisposable.add(editorActions.onDidChange(() => updateToolBarActions()));
                 }
             }
+            if (this.globalToolbarMenu) {
+                const leading = {
+                    primary: [],
+                    secondary: []
+                };
+                fillInActionBarActions(
+                    this.globalToolbarMenu.getActions(),
+                    leading,
+                    actionGroup => actionGroup === TitleBarLeadingActionsGroup
+                );
+                actions.primary.push(...leading.primary);
+            }
             if (this.layoutToolbarMenu) {
                 fillInActionBarActions(
                     this.layoutToolbarMenu.getActions(),
@@ -544,7 +573,8 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                 );
             }
             if (this.globalToolbarMenu) {
-                fillInActionBarActions(this.globalToolbarMenu.getActions(), actions);
+                const trailingGroups = this.globalToolbarMenu.getActions().filter(([group]) => group !== TitleBarLeadingActionsGroup);
+                fillInActionBarActions(trailingGroups, actions);
             }
             if (this.activityActionsEnabled) {
                 if (isAccountsActionVisible(this.storageService)) {
@@ -703,7 +733,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
         super.dispose();
     }
 };
-BrowserTitlebarPart = ( __decorate([( __param(3, IContextMenuService)), ( __param(4, IConfigurationService)), ( __param(5, IBrowserWorkbenchEnvironmentService)), ( __param(6, IInstantiationService)), ( __param(7, IThemeService)), ( __param(8, IStorageService)), ( __param(9, IWorkbenchLayoutService)), ( __param(10, IContextKeyService)), ( __param(11, IHostService)), ( __param(12, IEditorService)), ( __param(13, IMenuService)), ( __param(14, IKeybindingService))], BrowserTitlebarPart));
+BrowserTitlebarPart = ( __decorate([( __param(3, IContextMenuService)), ( __param(4, IConfigurationService)), ( __param(5, IBrowserWorkbenchEnvironmentService)), ( __param(6, IInstantiationService)), ( __param(7, IThemeService)), ( __param(8, IStorageService)), ( __param(9, IWorkbenchLayoutService)), ( __param(10, IContextKeyService)), ( __param(11, IHostService)), ( __param(12, IEditorService)), ( __param(13, IMenuService)), ( __param(14, IKeybindingService)), ( __param(15, IActionViewItemService))], BrowserTitlebarPart));
 let MainBrowserTitlebarPart = class MainBrowserTitlebarPart extends BrowserTitlebarPart {
     constructor(
         contextMenuService,
@@ -718,7 +748,8 @@ let MainBrowserTitlebarPart = class MainBrowserTitlebarPart extends BrowserTitle
         editorGroupService,
         editorService,
         menuService,
-        keybindingService
+        keybindingService,
+        actionViewItemService
     ) {
         super(
             Parts.TITLEBAR_PART,
@@ -735,11 +766,12 @@ let MainBrowserTitlebarPart = class MainBrowserTitlebarPart extends BrowserTitle
             hostService,
             editorService,
             menuService,
-            keybindingService
+            keybindingService,
+            actionViewItemService
         );
     }
 };
-MainBrowserTitlebarPart = ( __decorate([( __param(0, IContextMenuService)), ( __param(1, IConfigurationService)), ( __param(2, IBrowserWorkbenchEnvironmentService)), ( __param(3, IInstantiationService)), ( __param(4, IThemeService)), ( __param(5, IStorageService)), ( __param(6, IWorkbenchLayoutService)), ( __param(7, IContextKeyService)), ( __param(8, IHostService)), ( __param(9, IEditorGroupsService)), ( __param(10, IEditorService)), ( __param(11, IMenuService)), ( __param(12, IKeybindingService))], MainBrowserTitlebarPart));
+MainBrowserTitlebarPart = ( __decorate([( __param(0, IContextMenuService)), ( __param(1, IConfigurationService)), ( __param(2, IBrowserWorkbenchEnvironmentService)), ( __param(3, IInstantiationService)), ( __param(4, IThemeService)), ( __param(5, IStorageService)), ( __param(6, IWorkbenchLayoutService)), ( __param(7, IContextKeyService)), ( __param(8, IHostService)), ( __param(9, IEditorGroupsService)), ( __param(10, IEditorService)), ( __param(11, IMenuService)), ( __param(12, IKeybindingService)), ( __param(13, IActionViewItemService))], MainBrowserTitlebarPart));
 let AuxiliaryBrowserTitlebarPart = class AuxiliaryBrowserTitlebarPart extends BrowserTitlebarPart {
     static {
         AuxiliaryBrowserTitlebarPart_1 = this;
@@ -766,7 +798,8 @@ let AuxiliaryBrowserTitlebarPart = class AuxiliaryBrowserTitlebarPart extends Br
         editorGroupService,
         editorService,
         menuService,
-        keybindingService
+        keybindingService,
+        actionViewItemService
     ) {
         const id = AuxiliaryBrowserTitlebarPart_1.COUNTER++;
         super(
@@ -784,7 +817,8 @@ let AuxiliaryBrowserTitlebarPart = class AuxiliaryBrowserTitlebarPart extends Br
             hostService,
             editorService,
             menuService,
-            keybindingService
+            keybindingService,
+            actionViewItemService
         );
         this.container = container;
         this.mainTitlebar = mainTitlebar;
@@ -793,6 +827,6 @@ let AuxiliaryBrowserTitlebarPart = class AuxiliaryBrowserTitlebarPart extends Br
         return getZoomFactor(getWindow(this.element)) < 1 || !this.mainTitlebar.hasZoomableElements;
     }
 };
-AuxiliaryBrowserTitlebarPart = AuxiliaryBrowserTitlebarPart_1 = ( __decorate([( __param(3, IContextMenuService)), ( __param(4, IConfigurationService)), ( __param(5, IBrowserWorkbenchEnvironmentService)), ( __param(6, IInstantiationService)), ( __param(7, IThemeService)), ( __param(8, IStorageService)), ( __param(9, IWorkbenchLayoutService)), ( __param(10, IContextKeyService)), ( __param(11, IHostService)), ( __param(12, IEditorGroupsService)), ( __param(13, IEditorService)), ( __param(14, IMenuService)), ( __param(15, IKeybindingService))], AuxiliaryBrowserTitlebarPart));
+AuxiliaryBrowserTitlebarPart = AuxiliaryBrowserTitlebarPart_1 = ( __decorate([( __param(3, IContextMenuService)), ( __param(4, IConfigurationService)), ( __param(5, IBrowserWorkbenchEnvironmentService)), ( __param(6, IInstantiationService)), ( __param(7, IThemeService)), ( __param(8, IStorageService)), ( __param(9, IWorkbenchLayoutService)), ( __param(10, IContextKeyService)), ( __param(11, IHostService)), ( __param(12, IEditorGroupsService)), ( __param(13, IEditorService)), ( __param(14, IMenuService)), ( __param(15, IKeybindingService)), ( __param(16, IActionViewItemService))], AuxiliaryBrowserTitlebarPart));
 
 export { AuxiliaryBrowserTitlebarPart, BrowserTitleService, BrowserTitlebarPart, MainBrowserTitlebarPart };