@codingame/monaco-vscode-view-common-service-override 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/activitybarpart.css.js';
 import './media/activityaction.css.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { Parts, Position, LayoutSettings, ActivityBarPosition } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -48,7 +48,6 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 
 var ActivitybarPart_1;
-const _moduleId = "vs/workbench/browser/parts/activitybar/activitybarPart";
 let ActivitybarPart = class ActivitybarPart extends Part {
     static { ActivitybarPart_1 = this; }
     static { this.ACTION_HEIGHT = 48; }
@@ -193,11 +192,11 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
     fillContextMenuActions(actions, e) {
         const menuBarVisibility = getMenuBarVisibility(this.configurationService);
         if (menuBarVisibility === 'compact' || menuBarVisibility === 'hidden' || menuBarVisibility === 'toggle') {
-            actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localizeWithPath(_moduleId, 0, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
+            actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localize(3283, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
         }
         if (menuBarVisibility === 'compact' && this.menuBarContainer && e?.target) {
             if (isAncestor(e.target, this.menuBarContainer)) {
-                actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localizeWithPath(_moduleId, 1, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
+                actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localize(3284, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
             }
         }
         if (this.globalCompositeBar) {
@@ -290,12 +289,11 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
         super.layout(width, height);
     }
     getActivityBarContextMenuActions() {
-        const activityBarPositionMenu = this.menuService.createMenu(MenuId.ActivityBarPositionMenu, this.contextKeyService);
+        const activityBarPositionMenu = this.menuService.getMenuActions(MenuId.ActivityBarPositionMenu, this.contextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
         const positionActions = [];
-        createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
-        activityBarPositionMenu.dispose();
+        createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
         return [
-            ( (new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(_moduleId, 2, "Activity Bar Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3285, "Activity Bar Position")), positionActions))),
             toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => ( (new ToggleSidebarPositionAction())).run(accessor)) })
         ];
     }
@@ -316,10 +314,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.default',
             title: {
-                ...( localize2WithPath(_moduleId, 3, 'Move Activity Bar to Side')),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 4, "&&Default")),
+                ...( localize2(3286, 'Move Activity Bar to Side')),
+                mnemonicTitle: ( localize(3287, "&&Default")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 5, "Default")),
+            shortTitle: ( localize(3288, "Default")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
@@ -347,10 +345,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.top',
             title: {
-                ...( localize2WithPath(_moduleId, 6, 'Move Activity Bar to Top')),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 7, "&&Top")),
+                ...( localize2(3289, 'Move Activity Bar to Top')),
+                mnemonicTitle: ( localize(3290, "&&Top")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 8, "Top")),
+            shortTitle: ( localize(3291, "Top")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP))),
             menu: [{
@@ -372,10 +370,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.bottom',
             title: {
-                ...( localize2WithPath(_moduleId, 9, 'Move Activity Bar to Bottom')),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 10, "&&Bottom")),
+                ...( localize2(3292, 'Move Activity Bar to Bottom')),
+                mnemonicTitle: ( localize(3293, "&&Bottom")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 11, "Bottom")),
+            shortTitle: ( localize(3294, "Bottom")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
@@ -403,10 +401,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.hide',
             title: {
-                ...( localize2WithPath(_moduleId, 12, 'Hide Activity Bar')),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 13, "&&Hidden")),
+                ...( localize2(3295, 'Hide Activity Bar')),
+                mnemonicTitle: ( localize(3296, "&&Hidden")),
             },
-            shortTitle: ( localizeWithPath(_moduleId, 14, "Hidden")),
+            shortTitle: ( localize(3297, "Hidden")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`,
@@ -431,13 +429,13 @@ registerAction2(class extends Action2 {
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
+    title: ( localize(3298, "Activity Bar Position")),
     group: '3_workbench_layout_move',
     order: 2
 });
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
+    title: ( localize(3298, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewContainerLocation',
         ViewContainerLocationToString(ViewContainerLocation.Sidebar)
@@ -447,7 +445,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localizeWithPath(_moduleId, 15, "Activity Bar Position")),
+    title: ( localize(3298, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewLocation',
         ViewContainerLocationToString(ViewContainerLocation.Sidebar)
@@ -481,7 +479,7 @@ registerAction2(class PreviousSideBarViewAction extends SwitchSideBarViewAction
     constructor() {
         super({
             id: 'workbench.action.previousSideBarView',
-            title: ( localize2WithPath(_moduleId, 16, 'Previous Primary Side Bar View')),
+            title: ( localize2(3299, 'Previous Primary Side Bar View')),
             category: Categories.View,
             f1: true
         }, -1);
@@ -491,7 +489,7 @@ registerAction2(class NextSideBarViewAction extends SwitchSideBarViewAction {
     constructor() {
         super({
             id: 'workbench.action.nextSideBarView',
-            title: ( localize2WithPath(_moduleId, 17, 'Next Primary Side Bar View')),
+            title: ( localize2(3300, 'Next Primary Side Bar View')),
             category: Categories.View,
             f1: true
         }, 1);
@@ -501,7 +499,7 @@ registerAction2(class FocusActivityBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusActivityBar',
-            title: ( localize2WithPath(_moduleId, 18, 'Focus Activity Bar')),
+            title: ( localize2(3301, 'Focus Activity Bar')),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/auxiliaryBarPart.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -45,7 +45,6 @@ import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var AuxiliaryBarPart_1;
-const _moduleId = "vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart";
 let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart {
     static { AuxiliaryBarPart_1 = this; }
     static { this.activePanelSettingsKey = 'workbench.auxiliarybar.activepanelid'; }
@@ -142,15 +141,14 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
             actions.push(( (new Separator())));
             actions.push(viewsSubmenuAction);
         }
-        const activityBarPositionMenu = this.menuService.createMenu(MenuId.ActivityBarPositionMenu, this.contextKeyService);
+        const activityBarPositionMenu = this.menuService.getMenuActions(MenuId.ActivityBarPositionMenu, this.contextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
         const positionActions = [];
-        createAndFillInContextMenuActions(activityBarPositionMenu, { shouldForwardArgs: true, renderShortTitle: true }, { primary: [], secondary: positionActions });
-        activityBarPositionMenu.dispose();
+        createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
         actions.push(...[
             ( (new Separator())),
-            ( (new SubmenuAction('workbench.action.panel.position', ( localizeWithPath(_moduleId, 0, "Activity Bar Position")), positionActions))),
-            toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localizeWithPath(_moduleId, 1, "Move Secondary Side Bar Left")) : ( localizeWithPath(_moduleId, 2, "Move Secondary Side Bar Right")), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
-            toAction({ id: ToggleAuxiliaryBarAction.ID, label: ( localizeWithPath(_moduleId, 3, "Hide Secondary Side Bar")), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3305, "Activity Bar Position")), positionActions))),
+            toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? ( localize(3306, "Move Secondary Side Bar Left")) : ( localize(3307, "Move Secondary Side Bar Right")), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
+            toAction({ id: ToggleAuxiliaryBarAction.ID, label: ( localize(3308, "Hide Secondary Side Bar")), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
         ]);
     }
     shouldShowCompositeBar() {
@@ -181,12 +179,6 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         headerArea.appendChild(globalHeaderContainer);
         return headerArea;
     }
-    getToolbarWidth() {
-        if (this.getCompositeBarPosition() === CompositeBarPosition.TOP) {
-            return 22;
-        }
-        return super.getToolbarWidth();
-    }
     headerActionViewItemProvider(action, options) {
         if (action.id === ToggleAuxiliaryBarAction.ID) {
             return this.instantiationService.createInstance(ActionViewItem, undefined, action, options);

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title{background-color:var(--vscode-sideBarTitle-background)}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
+var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title{background-color:var(--vscode-sideBarTitle-background)}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:5px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/compositeBar.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { toAction } from 'vscode/vscode/vs/base/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ActionsOrientation, ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
@@ -14,7 +14,6 @@ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.
 import { CompositeDragAndDropObserver, toggleDropEffect } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { Gesture, EventType as EventType$1 } from 'vscode/vscode/vs/base/browser/touch';
 
-const _moduleId = "vs/workbench/browser/parts/compositeBar";
 class CompositeDragAndDrop {
     constructor(viewDescriptorService, targetContainerLocation, orientation, openComposite, moveComposite, getItems) {
         this.viewDescriptorService = viewDescriptorService;
@@ -123,7 +122,7 @@ let CompositeBar = class CompositeBar extends Widget {
                 return item && this.instantiationService.createInstance(CompositeActionViewItem, { ...options, draggable: true, colors: this.options.colors, icon: this.options.icon, hoverOptions: this.options.activityHoverOptions, compact: this.options.compact }, action, item.pinnedAction, item.toggleBadgeAction, compositeId => this.options.getContextMenuActionsForComposite(compositeId), () => this.getContextMenuActions(), this.options.dndHandler, this);
             },
             orientation: this.options.orientation,
-            ariaLabel: ( localizeWithPath(_moduleId, 0, "Active View Switcher")),
+            ariaLabel: ( localize(11093, "Active View Switcher")),
             ariaRole: 'tablist',
             preventLoopNavigation: this.options.preventLoopNavigation,
             triggerKeys: { keyDown: true }

package/vscode/src/vs/workbench/browser/parts/compositePart.js

@@ -1,5 +1,5 @@
 import './media/compositepart.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { defaultGenerator } from 'vscode/vscode/vs/base/common/idGenerator';
 import { MutableDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -19,7 +19,6 @@ import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/tool
 import { defaultProgressBarStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
-const _moduleId = "vs/workbench/browser/parts/compositePart";
 class CompositePart extends Part {
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
         super(id, options, themeService, storageService, layoutService);
@@ -191,7 +190,7 @@ class CompositePart extends Part {
         const keybinding = this.keybindingService.lookupKeybinding(compositeId);
         this.titleLabel.updateTitle(compositeId, compositeTitle, keybinding?.getLabel() ?? undefined);
         const toolBar = assertIsDefined(this.toolBar);
-        toolBar.setAriaLabel(( localizeWithPath(_moduleId, 0, "{0} actions", compositeTitle)));
+        toolBar.setAriaLabel(( localize(11090, "{0} actions", compositeTitle)));
     }
     collectCompositeActions(composite) {
         const menuIds = composite?.getMenuIds();
@@ -236,7 +235,7 @@ class CompositePart extends Part {
             orientation: ActionsOrientation.HORIZONTAL,
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-            toggleMenuTitle: ( localizeWithPath(_moduleId, 1, "Views and More Actions...")),
+            toggleMenuTitle: ( localize(11091, "Views and More Actions...")),
             telemetrySource: this.nameForTelemetry,
             hoverDelegate: this.toolbarHoverDelegate
         }));
@@ -253,7 +252,7 @@ class CompositePart extends Part {
             updateTitle: (id, title, keybinding) => {
                 if (!this.activeComposite || this.activeComposite.getId() === id) {
                     titleLabel.innerText = title;
-                    hover.update(keybinding ? ( localizeWithPath(_moduleId, 2, "{0} ({1})", title, keybinding)) : title);
+                    hover.update(keybinding ? ( localize(11092, "{0} ({1})", title, keybinding)) : title);
                 }
             },
             updateStyles: () => {