@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/notificationsToasts.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
 import { toDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Dimension, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, isAncestorOfActiveElement, EventType } from '../../../../base/browser/dom.js';
@@ -36,7 +36,6 @@ import { NotificationsToastsVisibleContext } from '../../../common/contextkeys.j
 import { mainWindow } from '../../../../base/browser/window.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var NotificationsToasts_1;
-const _moduleId = "vs/workbench/browser/parts/notifications/notificationsToasts";
 var ToastVisibility;
 ( ((function(ToastVisibility) {
     ToastVisibility[ToastVisibility["HIDDEN_OR_VISIBLE"] = 0] = "HIDDEN_OR_VISIBLE";
@@ -54,7 +53,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
     }; }
     static { this.SPAM_PROTECTION = {
         interval: 800,
-        limit: NotificationsToasts_1.MAX_NOTIFICATIONS
+        limit: this.MAX_NOTIFICATIONS
     }; }
     get isVisible() { return !!this._isVisible; }
     constructor(container, model, instantiationService, layoutService, themeService, editorGroupService, contextKeyService, lifecycleService, hostService) {
@@ -141,15 +140,9 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             verticalScrollMode: ScrollbarVisibility.Hidden,
             widgetAriaLabel: (() => {
                 if (!item.source) {
-                    return ( localizeWithPath(_moduleId, 0, "{0}, notification", item.message.raw));
+                    return ( localize(2646, "{0}, notification", item.message.raw));
                 }
-                return ( localizeWithPath(
-                    _moduleId,
-                    1,
-                    "{0}, source: {1}, notification",
-                    item.message.raw,
-                    item.source
-                ));
+                return ( localize(2647, "{0}, source: {1}, notification", item.message.raw, item.source));
             })()
         });
         itemDisposables.add(notificationList);

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { clearNode, $, EventType, addDisposableListener, EventHelper, isEventLike } from '../../../../base/browser/dom.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { URI } from '../../../../base/common/uri.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ButtonBar } from '../../../../base/browser/ui/button/button.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { toAction, Separator, ActionRunner } from '../../../../base/common/actions.js';
@@ -29,7 +29,6 @@ import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hover
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var NotificationRenderer_1, NotificationTemplateRenderer_1;
-const _moduleId = "vs/workbench/browser/parts/notifications/notificationsViewer";
 class NotificationsListDelegate {
     static { this.ROW_HEIGHT = 42; }
     static { this.LINE_HEIGHT = 22; }
@@ -96,9 +95,8 @@ class NotificationMessageRenderer {
             else {
                 let title = node.title;
                 if (!title && node.href.startsWith('command:')) {
-                    title = ( localizeWithPath(
-                        _moduleId,
-                        0,
+                    title = ( localize(
+                        10590,
                         "Click to execute command '{0}'",
                         node.href.substr('command:'.length)
                     ));
@@ -157,7 +155,7 @@ let NotificationRenderer = class NotificationRenderer {
         const toolbarContainer = document.createElement('div');
         toolbarContainer.classList.add('notification-list-item-toolbar-container');
         data.toolbar = ( (new ActionBar(toolbarContainer, {
-            ariaLabel: ( localizeWithPath(_moduleId, 1, "Notification Actions")),
+            ariaLabel: ( localize(10591, "Notification Actions")),
             actionViewItemProvider: (action, options) => {
                 if (action instanceof ConfigureNotificationAction) {
                     return data.toDispose.add(( (new DropdownMenuActionViewItem(action, {
@@ -168,12 +166,7 @@ let NotificationRenderer = class NotificationRenderer {
                                 const isSourceFiltered = that.notificationService.getFilter(source) === NotificationsFilter.ERROR;
                                 actions.push(toAction({
                                     id: source.id,
-                                    label: isSourceFiltered ? ( localizeWithPath(_moduleId, 2, "Turn On All Notifications from '{0}'", source.label)) : ( localizeWithPath(
-                                        _moduleId,
-                                        3,
-                                        "Turn Off Info and Warning Notifications from '{0}'",
-                                        source.label
-                                    )),
+                                    label: isSourceFiltered ? ( localize(10592, "Turn On All Notifications from '{0}'", source.label)) : ( localize(10593, "Turn Off Info and Warning Notifications from '{0}'", source.label)),
                                     run: () => that.notificationService.setFilter({ ...source, filter: isSourceFiltered ? NotificationsFilter.OFF : NotificationsFilter.ERROR })
                                 }));
                                 if (action.notification.actions?.secondary?.length) {
@@ -335,7 +328,7 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
     }
     renderSource(notification, sourceCustomHover) {
         if (notification.expanded && notification.source) {
-            this.template.source.textContent = ( localizeWithPath(_moduleId, 4, "Source: {0}", notification.source));
+            this.template.source.textContent = ( localize(10594, "Source: {0}", notification.source));
             sourceCustomHover.update(notification.source);
         }
         else {

package/vscode/src/vs/workbench/browser/parts/panel/media/panelpart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench.nopanel .part.panel{display:none!important;visibility:hidden!important}.monaco-workbench .part.panel.bottom .composite.title{border-top-style:solid;border-top-width:1px}.monaco-workbench.nomaineditorarea .part.panel.bottom .composite.title{border-top-width:0}.monaco-workbench .part.panel.right{border-left-style:solid;border-left-width:1px}.monaco-workbench.nomaineditorarea .part.panel.right{border-left-width:0}.monaco-workbench .part.panel.left{border-right-style:solid;border-right-width:1px}.monaco-workbench.nomaineditorarea .part.panel.left{border-right-width:0}.monaco-workbench .part.panel>.content .monaco-editor,.monaco-workbench .part.panel>.content .monaco-editor .margin,.monaco-workbench .part.panel>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-panel-background)}.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .margin,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .monaco-editor-background{background-color:inherit}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.panel>.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.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-panelTitle-activeForeground)!important}.monaco-workbench .part.panel .monaco-inputbox{border-color:var(--vscode-panelInput-border,transparent)!important}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:none}.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.right .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(-90deg)}.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.left .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(90deg)}";
+var css = ".monaco-workbench.nopanel .part.panel{display:none!important;visibility:hidden!important}.monaco-workbench .part.panel.bottom .composite.title{border-top-style:solid;border-top-width:1px}.monaco-workbench.nomaineditorarea .part.panel.bottom .composite.title{border-top-width:0}.monaco-workbench .part.panel.top{border-bottom-style:solid;border-bottom-width:1px}.monaco-workbench.nomaineditorarea .part.panel.top{border-bottom-width:0}.monaco-workbench .part.panel.right{border-left-style:solid;border-left-width:1px}.monaco-workbench.nomaineditorarea .part.panel.right{border-left-width:0}.monaco-workbench .part.panel.left{border-right-style:solid;border-right-width:1px}.monaco-workbench.nomaineditorarea .part.panel.left{border-right-width:0}.monaco-workbench .part.panel>.content .monaco-editor,.monaco-workbench .part.panel>.content .monaco-editor .margin,.monaco-workbench .part.panel>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-panel-background)}.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .margin,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .monaco-editor-background{background-color:inherit}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.panel>.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.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-panelTitle-activeForeground)!important}.monaco-workbench .part.panel .monaco-inputbox{border-color:var(--vscode-panelInput-border,transparent)!important}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:none}.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.right .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(-90deg)}.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.left .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(90deg)}.monaco-workbench .part.basepanel.top .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.top .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.top .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(180deg)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js

@@ -1,9 +1,9 @@
 import './media/panelpart.css.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { Parts, Position, LayoutSettings, ActivityBarPosition, positionToString } from '../../../services/layout/browser/layoutService.js';
+import { Parts, Position, isHorizontal, LayoutSettings, ActivityBarPosition, positionToString } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { PanelVisibleContext, PanelAlignmentContext, PanelPositionContext, PanelMaximizedContext, AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -15,23 +15,22 @@ import { IViewsService } from '../../../services/views/common/viewsService.servi
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-const _moduleId = "vs/workbench/browser/parts/panel/panelActions";
-const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, ( localizeWithPath(_moduleId, 0, 'Icon to maximize a panel.')));
-const restoreIcon = registerIcon('panel-restore', Codicon.chevronDown, ( localizeWithPath(_moduleId, 1, 'Icon to restore a panel.')));
-const closeIcon = registerIcon('panel-close', Codicon.close, ( localizeWithPath(_moduleId, 2, 'Icon to close a panel.')));
-const panelIcon = registerIcon('panel-layout-icon', Codicon.layoutPanel, ( localizeWithPath(_moduleId, 3, 'Icon to toggle the panel off when it is on.')));
-const panelOffIcon = registerIcon('panel-layout-icon-off', Codicon.layoutPanelOff, ( localizeWithPath(_moduleId, 4, 'Icon to toggle the panel on when it is off.')));
+const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, ( localize(9275, 'Icon to maximize a panel.')));
+const restoreIcon = registerIcon('panel-restore', Codicon.chevronDown, ( localize(9276, 'Icon to restore a panel.')));
+const closeIcon = registerIcon('panel-close', Codicon.close, ( localize(9277, 'Icon to close a panel.')));
+const panelIcon = registerIcon('panel-layout-icon', Codicon.layoutPanel, ( localize(9278, 'Icon to toggle the panel off when it is on.')));
+const panelOffIcon = registerIcon('panel-layout-icon-off', Codicon.layoutPanelOff, ( localize(9279, 'Icon to toggle the panel on when it is off.')));
 class TogglePanelAction extends Action2 {
     static { this.ID = 'workbench.action.togglePanel'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 5, "Toggle Panel Visibility")); }
+    static { this.LABEL = ( localize2(9280, "Toggle Panel Visibility")); }
     constructor() {
         super({
             id: TogglePanelAction.ID,
             title: TogglePanelAction.LABEL,
             toggled: {
                 condition: PanelVisibleContext,
-                title: ( localizeWithPath(_moduleId, 6, "Panel")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 7, "&&Panel")),
+                title: ( localize(9281, "Panel")),
+                mnemonicTitle: ( localize(9282, "&&Panel")),
             },
             f1: true,
             category: Categories.View,
@@ -57,11 +56,11 @@ class TogglePanelAction extends Action2 {
 registerAction2(TogglePanelAction);
 registerAction2(class extends Action2 {
     static { this.ID = 'workbench.action.focusPanel'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 8, "Focus into Panel")); }
+    static { this.LABEL = ( localize(9283, "Focus into Panel")); }
     constructor() {
         super({
             id: 'workbench.action.focusPanel',
-            title: ( localize2WithPath(_moduleId, 8, "Focus into Panel")),
+            title: ( localize2(9283, "Focus into Panel")),
             category: Categories.View,
             f1: true,
         });
@@ -80,6 +79,7 @@ const PositionPanelActionId = {
     LEFT: 'workbench.action.positionPanelLeft',
     RIGHT: 'workbench.action.positionPanelRight',
     BOTTOM: 'workbench.action.positionPanelBottom',
+    TOP: 'workbench.action.positionPanelTop'
 };
 const AlignPanelActionId = {
     LEFT: 'workbench.action.alignPanelLeft',
@@ -103,23 +103,24 @@ function createAlignmentPanelActionConfig(id, title, shortLabel, alignment) {
     return createPanelActionConfig(id, title, shortLabel, alignment, ( (PanelAlignmentContext.notEqualsTo(alignment))));
 }
 const PositionPanelActionConfigs = [
-    createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2WithPath(_moduleId, 9, "Move Panel Left")), ( localizeWithPath(_moduleId, 10, "Left")), Position.LEFT),
-    createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2WithPath(_moduleId, 11, "Move Panel Right")), ( localizeWithPath(_moduleId, 12, "Right")), Position.RIGHT),
-    createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2WithPath(_moduleId, 13, "Move Panel To Bottom")), ( localizeWithPath(_moduleId, 14, "Bottom")), Position.BOTTOM),
+    createPositionPanelActionConfig(PositionPanelActionId.TOP, ( localize2(9284, "Move Panel To Top")), ( localize(9285, "Top")), Position.TOP),
+    createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2(9286, "Move Panel Left")), ( localize(9287, "Left")), Position.LEFT),
+    createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2(9288, "Move Panel Right")), ( localize(9289, "Right")), Position.RIGHT),
+    createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2(9290, "Move Panel To Bottom")), ( localize(9291, "Bottom")), Position.BOTTOM),
 ];
 const AlignPanelActionConfigs = [
-    createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, ( localize2WithPath(_moduleId, 15, "Set Panel Alignment to Left")), ( localizeWithPath(_moduleId, 16, "Left")), 'left'),
-    createAlignmentPanelActionConfig(AlignPanelActionId.RIGHT, ( localize2WithPath(_moduleId, 17, "Set Panel Alignment to Right")), ( localizeWithPath(_moduleId, 18, "Right")), 'right'),
-    createAlignmentPanelActionConfig(AlignPanelActionId.CENTER, ( localize2WithPath(_moduleId, 19, "Set Panel Alignment to Center")), ( localizeWithPath(_moduleId, 20, "Center")), 'center'),
-    createAlignmentPanelActionConfig(AlignPanelActionId.JUSTIFY, ( localize2WithPath(_moduleId, 21, "Set Panel Alignment to Justify")), ( localizeWithPath(_moduleId, 22, "Justify")), 'justify'),
+    createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, ( localize2(9292, "Set Panel Alignment to Left")), ( localize(9293, "Left")), 'left'),
+    createAlignmentPanelActionConfig(AlignPanelActionId.RIGHT, ( localize2(9294, "Set Panel Alignment to Right")), ( localize(9295, "Right")), 'right'),
+    createAlignmentPanelActionConfig(AlignPanelActionId.CENTER, ( localize2(9296, "Set Panel Alignment to Center")), ( localize(9297, "Center")), 'center'),
+    createAlignmentPanelActionConfig(AlignPanelActionId.JUSTIFY, ( localize2(9298, "Set Panel Alignment to Justify")), ( localize(9299, "Justify")), 'justify'),
 ];
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.PanelPositionMenu,
-    title: ( localizeWithPath(_moduleId, 23, "Panel Position")),
+    title: ( localize(9300, "Panel Position")),
     group: '3_workbench_layout_move',
     order: 4
 });
-PositionPanelActionConfigs.forEach(positionPanelAction => {
+PositionPanelActionConfigs.forEach((positionPanelAction, index) => {
     const { id, title, shortLabel, value, when } = positionPanelAction;
     registerAction2(class extends Action2 {
         constructor() {
@@ -141,12 +142,12 @@ PositionPanelActionConfigs.forEach(positionPanelAction => {
             title: shortLabel,
             toggled: ( (when.negate()))
         },
-        order: 5
+        order: 5 + index
     });
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.PanelAlignmentMenu,
-    title: ( localizeWithPath(_moduleId, 24, "Align Panel")),
+    title: ( localize(9301, "Align Panel")),
     group: '3_workbench_layout_move',
     order: 5
 });
@@ -206,7 +207,7 @@ class SwitchPanelViewAction extends Action2 {
 }
 registerAction2(class extends SwitchPanelViewAction {
     constructor() {
-        super('workbench.action.previousPanelView', ( localize2WithPath(_moduleId, 25, "Previous Panel View")));
+        super('workbench.action.previousPanelView', ( localize2(9302, "Previous Panel View")));
     }
     run(accessor) {
         return super.run(accessor, -1);
@@ -214,7 +215,7 @@ registerAction2(class extends SwitchPanelViewAction {
 });
 registerAction2(class extends SwitchPanelViewAction {
     constructor() {
-        super('workbench.action.nextPanelView', ( localize2WithPath(_moduleId, 26, "Next Panel View")));
+        super('workbench.action.nextPanelView', ( localize2(9303, "Next Panel View")));
     }
     run(accessor) {
         return super.run(accessor, 1);
@@ -224,23 +225,29 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleMaximizedPanel',
-            title: ( localize2WithPath(_moduleId, 27, 'Toggle Maximized Panel')),
-            tooltip: ( localizeWithPath(_moduleId, 28, "Maximize Panel Size")),
+            title: ( localize2(9304, 'Toggle Maximized Panel')),
+            tooltip: ( localize(9305, "Maximize Panel Size")),
             category: Categories.View,
             f1: true,
             icon: maximizeIcon,
             precondition: ( (ContextKeyExpr.or(
                  (PanelAlignmentContext.isEqualTo('center')),
-                 (PanelPositionContext.notEqualsTo('bottom'))
+                 (ContextKeyExpr.and(
+                     (PanelPositionContext.notEqualsTo('bottom')),
+                     (PanelPositionContext.notEqualsTo('top'))
+                ))
             ))),
-            toggled: { condition: PanelMaximizedContext, icon: restoreIcon, tooltip: ( localizeWithPath(_moduleId, 29, "Restore Panel Size")) },
+            toggled: { condition: PanelMaximizedContext, icon: restoreIcon, tooltip: ( localize(9306, "Restore Panel Size")) },
             menu: [{
                     id: MenuId.PanelTitle,
                     group: 'navigation',
                     order: 1,
                     when: ( (ContextKeyExpr.or(
                          (PanelAlignmentContext.isEqualTo('center')),
-                         (PanelPositionContext.notEqualsTo('bottom'))
+                         (ContextKeyExpr.and(
+                             (PanelPositionContext.notEqualsTo('bottom')),
+                             (PanelPositionContext.notEqualsTo('top'))
+                        ))
                     )))
                 }]
         });
@@ -248,12 +255,8 @@ registerAction2(class extends Action2 {
     run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const notificationService = accessor.get(INotificationService);
-        if (layoutService.getPanelAlignment() !== 'center' && layoutService.getPanelPosition() === Position.BOTTOM) {
-            notificationService.warn(( localizeWithPath(
-                _moduleId,
-                30,
-                "Maximizing the panel is only supported when it is center aligned."
-            )));
+        if (layoutService.getPanelAlignment() !== 'center' && isHorizontal(layoutService.getPanelPosition())) {
+            notificationService.warn(( localize(9307, "Maximizing the panel is only supported when it is center aligned.")));
             return;
         }
         if (!layoutService.isVisible(Parts.PANEL_PART)) {
@@ -271,7 +274,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closePanel',
-            title: ( localize2WithPath(_moduleId, 31, 'Hide Panel')),
+            title: ( localize2(9308, 'Hide Panel')),
             category: Categories.View,
             icon: closeIcon,
             menu: [{
@@ -292,7 +295,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closeAuxiliaryBar',
-            title: ( localize2WithPath(_moduleId, 32, 'Hide Secondary Side Bar')),
+            title: ( localize2(9309, 'Hide Secondary Side Bar')),
             category: Categories.View,
             icon: closeIcon,
             menu: [{
@@ -303,10 +306,6 @@ registerAction2(class extends Action2 {
                     group: 'navigation',
                     order: 2,
                     when: ( (ContextKeyExpr.notEquals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP)))
-                }, {
-                    id: MenuId.AuxiliaryBarHeader,
-                    group: 'navigation',
-                    when: ( (ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP)))
                 }]
         });
     }
@@ -321,7 +320,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: TogglePanelAction.ID,
-                title: ( localizeWithPath(_moduleId, 33, "Toggle Panel")),
+                title: ( localize(9310, "Toggle Panel")),
                 icon: panelOffIcon,
                 toggled: { condition: PanelVisibleContext, icon: panelIcon }
             },
@@ -337,7 +336,7 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: TogglePanelAction.ID,
-                title: ( localize2WithPath(_moduleId, 34, 'Hide Panel')),
+                title: ( localize2(9311, 'Hide Panel')),
             },
             when: ( (ContextKeyExpr.and(
                 PanelVisibleContext,
@@ -374,7 +373,7 @@ class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
             id: MovePanelToSidePanelAction.ID,
-            title: ( localize2WithPath(_moduleId, 35, "Move Panel Views To Secondary Side Bar")),
+            title: ( localize2(9312, "Move Panel Views To Secondary Side Bar")),
             category: Categories.View,
             f1: false
         });
@@ -385,7 +384,7 @@ class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
             id: MovePanelToSecondarySideBarAction.ID,
-            title: ( localize2WithPath(_moduleId, 35, "Move Panel Views To Secondary Side Bar")),
+            title: ( localize2(9312, "Move Panel Views To Secondary Side Bar")),
             category: Categories.View,
             f1: true
         });
@@ -398,7 +397,7 @@ class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
             id: MoveSidePanelToPanelAction.ID,
-            title: ( localize2WithPath(_moduleId, 36, "Move Secondary Side Bar Views To Panel")),
+            title: ( localize2(9313, "Move Secondary Side Bar Views To Panel")),
             category: Categories.View,
             f1: false
         });
@@ -409,7 +408,7 @@ class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAction {
     constructor() {
         super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
             id: MoveSecondarySideBarToPanelAction.ID,
-            title: ( localize2WithPath(_moduleId, 36, "Move Secondary Side Bar Views To Panel")),
+            title: ( localize2(9313, "Move Secondary Side Bar Views To Panel")),
             category: Categories.View,
             f1: true
         });

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/menubarControl.css.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { MenuRegistry, MenuId, SubmenuItemAction, registerAction2, MenuItemAction, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { getMenuBarVisibility, hasNativeTitlebar, TitleBarSetting } from '../../../../platform/window/common/window.js';
@@ -44,13 +44,12 @@ import { defaultMenuStyles } from '../../../../platform/theme/browser/defaultSty
 import { mainWindow } from '../../../../base/browser/window.js';
 import { ActivityBarPosition } from '../../../services/layout/browser/layoutService.js';
 import Severity$1 from '../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/browser/parts/titlebar/menubarControl";
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     submenu: MenuId.MenubarFileMenu,
     title: {
         value: 'File',
         original: 'File',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 0, "&&File")),
+        mnemonicTitle: ( localize(6915, "&&File")),
     },
     order: 1
 });
@@ -59,7 +58,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'Edit',
         original: 'Edit',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Edit"))
+        mnemonicTitle: ( localize(6916, "&&Edit"))
     },
     order: 2
 });
@@ -68,7 +67,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'Selection',
         original: 'Selection',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 2, "&&Selection"))
+        mnemonicTitle: ( localize(6917, "&&Selection"))
     },
     order: 3
 });
@@ -77,7 +76,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'View',
         original: 'View',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 3, "&&View"))
+        mnemonicTitle: ( localize(6918, "&&View"))
     },
     order: 4
 });
@@ -86,7 +85,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'Go',
         original: 'Go',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 4, "&&Go"))
+        mnemonicTitle: ( localize(6919, "&&Go"))
     },
     order: 5
 });
@@ -95,7 +94,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'Terminal',
         original: 'Terminal',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 5, "&&Terminal"))
+        mnemonicTitle: ( localize(6920, "&&Terminal"))
     },
     order: 7
 });
@@ -104,7 +103,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'Help',
         original: 'Help',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 6, "&&Help"))
+        mnemonicTitle: ( localize(6921, "&&Help"))
     },
     order: 8
 });
@@ -113,7 +112,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     title: {
         value: 'Preferences',
         original: 'Preferences',
-        mnemonicTitle: ( localizeWithPath(_moduleId, 7, "Preferences"))
+        mnemonicTitle: ( localize(6922, "Preferences"))
     },
     when: IsMacNativeContext,
     order: 9
@@ -277,14 +276,13 @@ class MenubarControl extends Disposable {
         if (hasBeenNotified || usingCustomMenubar || !this.accessibilityService.isScreenReaderOptimized()) {
             return;
         }
-        const message = ( localizeWithPath(
-            _moduleId,
-            8,
+        const message = ( localize(
+            6923,
             "Accessibility support is enabled for you. For the most accessible experience, we recommend the custom title bar style."
         ));
         this.notificationService.prompt(Severity$1.Info, message, [
             {
-                label: ( localizeWithPath(_moduleId, 9, "Open Settings")),
+                label: ( localize(6924, "Open Settings")),
                 run: () => {
                     return this.preferencesService.openUserSettings({ query: TitleBarSetting.TITLE_BAR_STYLE });
                 }
@@ -330,7 +328,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
                 constructor() {
                     super({
                         id: `workbench.actions.menubar.focus`,
-                        title: ( localize2WithPath(_moduleId, 10, 'Focus Application Menu')),
+                        title: ( localize2(6925, 'Focus Application Menu')),
                         keybinding: {
                             primary: KeyMod$1.Alt | KeyCode.F10,
                             weight: KeybindingWeight.WorkbenchContrib,
@@ -350,29 +348,29 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         switch (state.type) {
             case StateType.Idle:
                 return (
-                     (new Action('update.check', ( localizeWithPath(_moduleId, 11, "Check for &&Updates...")), undefined, true, () => this.updateService.checkForUpdates(true)))
+                     (new Action('update.check', ( localize(6926, "Check for &&Updates...")), undefined, true, () => this.updateService.checkForUpdates(true)))
                 );
             case StateType.CheckingForUpdates:
                 return (
-                     (new Action('update.checking', ( localizeWithPath(_moduleId, 12, "Checking for Updates...")), undefined, false))
+                     (new Action('update.checking', ( localize(6927, "Checking for Updates...")), undefined, false))
                 );
             case StateType.AvailableForDownload:
                 return (
-                     (new Action('update.downloadNow', ( localizeWithPath(_moduleId, 13, "D&&ownload Update")), undefined, true, () => this.updateService.downloadUpdate()))
+                     (new Action('update.downloadNow', ( localize(6928, "D&&ownload Update")), undefined, true, () => this.updateService.downloadUpdate()))
                 );
             case StateType.Downloading:
                 return (
-                     (new Action('update.downloading', ( localizeWithPath(_moduleId, 14, "Downloading Update...")), undefined, false))
+                     (new Action('update.downloading', ( localize(6929, "Downloading Update...")), undefined, false))
                 );
             case StateType.Downloaded:
-                return isMacintosh ? null : ( (new Action('update.install', ( localizeWithPath(_moduleId, 15, "Install &&Update...")), undefined, true, () => this.updateService.applyUpdate())));
+                return isMacintosh ? null : ( (new Action('update.install', ( localize(6930, "Install &&Update...")), undefined, true, () => this.updateService.applyUpdate())));
             case StateType.Updating:
                 return (
-                     (new Action('update.updating', ( localizeWithPath(_moduleId, 16, "Installing Update...")), undefined, false))
+                     (new Action('update.updating', ( localize(6931, "Installing Update...")), undefined, false))
                 );
             case StateType.Ready:
                 return (
-                     (new Action('update.restart', ( localizeWithPath(_moduleId, 17, "Restart to &&Update")), undefined, true, () => this.updateService.quitAndInstall()))
+                     (new Action('update.restart', ( localize(6932, "Restart to &&Update")), undefined, true, () => this.updateService.quitAndInstall()))
                 );
             default:
                 return null;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { dirname, basename } from '../../../../base/common/resources.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
@@ -24,7 +24,6 @@ import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBro
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { getWindowById } from '../../../../base/browser/dom.js';
 var WindowTitle_1;
-const _moduleId = "vs/workbench/browser/parts/titlebar/windowTitle";
 var WindowSettingNames;
 ( ((function(WindowSettingNames) {
     WindowSettingNames["titleSeparator"] = "window.titleSeparator";
@@ -43,8 +42,8 @@ const defaultWindowTitle = (() => {
 const defaultWindowTitleSeparator = isMacintosh ? ' \u2014 ' : ' - ';
 let WindowTitle = class WindowTitle extends Disposable {
     static { WindowTitle_1 = this; }
-    static { this.NLS_USER_IS_ADMIN = isWindows ? ( localizeWithPath(_moduleId, 0, "[Administrator]")) : ( localizeWithPath(_moduleId, 1, "[Superuser]")); }
-    static { this.NLS_EXTENSION_HOST = ( localizeWithPath(_moduleId, 2, "[Extension Development Host]")); }
+    static { this.NLS_USER_IS_ADMIN = isWindows ? ( localize(4782, "[Administrator]")) : ( localize(4783, "[Superuser]")); }
+    static { this.NLS_EXTENSION_HOST = ( localize(4784, "[Extension Development Host]")); }
     static { this.TITLE_DIRTY = '\u25cf '; }
     get value() { return this.title ?? ''; }
     get workspaceName() { return this.labelService.getWorkspaceLabel(this.contextService.getWorkspace()); }

package/vscode/src/vs/workbench/browser/parts/views/checkbox.js

@@ -3,9 +3,8 @@ import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-const _moduleId = "vs/workbench/browser/parts/views/checkbox";
 class CheckboxStateHandler extends Disposable {
     constructor() {
         super(...arguments);
@@ -85,7 +84,7 @@ class TreeItemCheckbox extends Disposable {
     }
     checkboxHoverContent(checkbox) {
         return checkbox.tooltip ? checkbox.tooltip :
-            checkbox.isChecked ? ( localizeWithPath(_moduleId, 0, 'Checked')) : ( localizeWithPath(_moduleId, 1, 'Unchecked'));
+            checkbox.isChecked ? ( localize(10903, 'Checked')) : ( localize(10904, 'Unchecked'));
     }
     setAccessibilityInformation(checkbox) {
         if (this.toggle && checkbox.accessibilityInformation) {