@codingame/monaco-vscode-view-title-bar-service-override 32.0.2 → 34.0.0

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@codingame/monaco-vscode-view-title-bar-service-override",
-  "version": "32.0.2",
+  "version": "34.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-title-bar service-override",
   "keywords": [],
+  "license": "MIT",
   "author": {
     "name": "CodinGame",
     "url": "http://www.codingame.com"
   },
-  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "32.0.2"
+    "@codingame/monaco-vscode-api": "34.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(3768, "Search"));
+                                label = ( localize(3849, "Search"));
                             }
                             if (prefix) {
-                                label = ( localize(3769, "{0} {1}", prefix, label));
+                                label = ( localize(3850, "{0} {1}", prefix, label));
                             }
                             if (suffix) {
-                                label = ( localize(3770, "{0} {1}", label, suffix));
+                                label = ( localize(3851, "{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(
-            3771,
+            3852,
             "Search {0} ({1}) — {2}",
             this._windowTitle.workspaceName,
             kb,
             this._windowTitle.value
         )) : ( localize(
-            3772,
+            3853,
             "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(3773, "Command Center")),
+    title: ( localize(3854, "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 { WindowTitle } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/titlebar/windowTitle";
 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";
@@ -61,6 +62,7 @@ export declare class BrowserTitleService extends MultiWindowParts<BrowserTitleba
     updateProperties(properties: ITitleProperties): void;
     private readonly variables;
     registerVariables(variables: ITitleVariable[]): void;
+    get windowTitle(): WindowTitle;
 }
 export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     private readonly editorGroupsContainer;
@@ -111,7 +113,7 @@ export declare class BrowserTitlebarPart extends Part implements ITitlebarPart {
     private readonly isAuxiliary;
     private isCompact;
     private readonly isCompactContextKey;
-    private readonly windowTitle;
+    readonly windowTitle: 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, actionViewItemService: IActionViewItemService);
     private registerListeners;

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

@@ -37,7 +37,7 @@ import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from '@codingame/monaco-vsco
 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';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { ActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { Separator, ActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ActionsOrientation, prepareActions } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { EDITOR_CORE_NAVIGATION_COMMANDS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommands';
@@ -77,7 +77,7 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
             constructor() {
                 super({
                     id: `workbench.action.focusTitleBar`,
-                    title: ( localize2(3809, "Focus Title Bar")),
+                    title: ( localize2(3890, "Focus Title Bar")),
                     category: Categories.View,
                     f1: true,
                     precondition: TitleBarVisibleContext
@@ -164,6 +164,9 @@ let BrowserTitleService = class BrowserTitleService extends MultiWindowParts {
             part.registerVariables(newVariables);
         }
     }
+    get windowTitle() {
+        return this.mainPart.windowTitle;
+    }
 };
 BrowserTitleService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IStorageService)), ( __param(2, IThemeService))], BrowserTitleService));
 let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
@@ -501,10 +504,10 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
             this.instantiationService.createInstance(WorkbenchToolBar, this.actionToolBarElement, {
                 contextMenu: MenuId.TitleBarContext,
                 orientation: ActionsOrientation.HORIZONTAL,
-                ariaLabel: ( localize(3810, "Title actions")),
+                ariaLabel: ( localize(3891, "Title actions")),
                 getKeyBinding: action => this.getKeybinding(action),
                 overflowBehavior: {
-                    maxItems: 9,
+                    maxItems: 12,
                     exempted: [
                         ACCOUNTS_ACTIVITY_ID,
                         GLOBAL_ACTIVITY_ID,
@@ -513,7 +516,7 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                 },
                 anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
                 telemetrySource: "titlePart",
-                highlightToggledItems: this.editorActionsEnabled || this.isAuxiliary,
+                highlightToggledItems: this.isAuxiliary,
                 actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
                 hoverDelegate: this.hoverDelegate
             })
@@ -540,6 +543,19 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                 primary: [],
                 secondary: []
             };
+            if (this.globalToolbarMenu) {
+                const leading = {
+                    primary: [],
+                    secondary: []
+                };
+                fillInActionBarActions(
+                    this.globalToolbarMenu.getActions(),
+                    leading,
+                    actionGroup => actionGroup === TitleBarLeadingActionsGroup
+                );
+                actions.primary.push(...leading.primary);
+                actions.primary.push(( new Separator()));
+            }
             if (this.editorActionsEnabled) {
                 this.editorActionsChangeDisposable.clear();
                 const activeGroup = this.editorGroupsContainer.activeGroup;
@@ -550,26 +566,15 @@ let BrowserTitlebarPart = class BrowserTitlebarPart extends Part {
                     );
                     actions.primary.push(...editorActions.actions.primary);
                     actions.secondary.push(...editorActions.actions.secondary);
+                    actions.primary.push(( new Separator()));
                     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(),
                     actions,
-                    () => !this.editorActionsEnabled || this.isCompact
+                    group => group === "navigation"
                 );
             }
             if (this.globalToolbarMenu) {