@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/browser/actions/textInputActions.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { Action, Separator } from '../../../base/common/actions.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.service.js';
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.service.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
@@ -11,7 +11,6 @@ import { IClipboardService } from '../../../platform/clipboard/common/clipboardS
 import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
 import { Event as Event$1 } from '../../../base/common/event.js';
 import { Lazy } from '../../../base/common/lazy.js';
-const _moduleId = "vs/workbench/browser/actions/textInputActions";
 let TextInputActionsProvider = class TextInputActionsProvider extends Disposable {
     static { this.ID = 'workbench.contrib.textInputActionsProvider'; }
     constructor(layoutService, contextMenuService, clipboardService) {
@@ -25,13 +24,13 @@ let TextInputActionsProvider = class TextInputActionsProvider extends Disposable
     createActions() {
         return [
             (
-            (new Action('undo', ( localizeWithPath(_moduleId, 0, "Undo")), undefined, true, async () => getActiveDocument().execCommand('undo')))),
-            ( (new Action('redo', ( localizeWithPath(_moduleId, 1, "Redo")), undefined, true, async () => getActiveDocument().execCommand('redo')))),
+            (new Action('undo', ( localize(646, "Undo")), undefined, true, async () => getActiveDocument().execCommand('undo')))),
+            ( (new Action('redo', ( localize(647, "Redo")), undefined, true, async () => getActiveDocument().execCommand('redo')))),
             ( (new Separator())),
             (
-            (new Action('editor.action.clipboardCutAction', ( localizeWithPath(_moduleId, 2, "Cut")), undefined, true, async () => getActiveDocument().execCommand('cut')))),
-            ( (new Action('editor.action.clipboardCopyAction', ( localizeWithPath(_moduleId, 3, "Copy")), undefined, true, async () => getActiveDocument().execCommand('copy')))),
-            ( (new Action('editor.action.clipboardPasteAction', ( localizeWithPath(_moduleId, 4, "Paste")), undefined, true, async (element) => {
+            (new Action('editor.action.clipboardCutAction', ( localize(648, "Cut")), undefined, true, async () => getActiveDocument().execCommand('cut')))),
+            ( (new Action('editor.action.clipboardCopyAction', ( localize(649, "Copy")), undefined, true, async () => getActiveDocument().execCommand('copy')))),
+            ( (new Action('editor.action.clipboardPasteAction', ( localize(650, "Paste")), undefined, true, async (element) => {
             if (isNative) {
                 getActiveDocument().execCommand('paste');
             }
@@ -50,7 +49,7 @@ let TextInputActionsProvider = class TextInputActionsProvider extends Disposable
         }))),
             ( (new Separator())),
             (
-            (new Action('editor.action.selectAll', ( localizeWithPath(_moduleId, 5, "Select All")), undefined, true, async () => getActiveDocument().execCommand('selectAll'))))
+            (new Action('editor.action.selectAll', ( localize(651, "Select All")), undefined, true, async () => getActiveDocument().execCommand('selectAll'))))
         ];
     }
     registerListeners() {

package/vscode/src/vs/workbench/browser/actions/windowActions.js

@@ -1,4 +1,4 @@
-import { localize2WithPath, localizeWithPath } from '../../../nls.js';
+import { localize2, localize } from '../../../nls.js';
 import { IDialogService } from '../../../platform/dialogs/common/dialogs.service.js';
 import { MenuId, Action2, registerAction2, MenuRegistry } from '../../../platform/actions/common/actions.js';
 import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../base/common/keyCodes.js';
@@ -29,23 +29,22 @@ import { CommandsRegistry } from '../../../platform/commands/common/commands.js'
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
 import { isFolderBackupInfo, isWorkspaceBackupInfo } from '../../../platform/backup/common/backup.js';
 import { getActiveWindow, getActiveElement, isHTMLElement } from '../../../base/browser/dom.js';
-const _moduleId = "vs/workbench/browser/actions/windowActions";
 const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
 class BaseOpenRecentAction extends Action2 {
     constructor(desc) {
         super(desc);
         this.removeFromRecentlyOpened = {
             iconClass: ThemeIcon.asClassName(Codicon.removeClose),
-            tooltip: ( localizeWithPath(_moduleId, 0, "Remove from Recently Opened"))
+            tooltip: ( localize(10053, "Remove from Recently Opened"))
         };
         this.dirtyRecentlyOpenedFolder = {
             iconClass: 'dirty-workspace ' + ThemeIcon.asClassName(Codicon.closeDirty),
-            tooltip: ( localizeWithPath(_moduleId, 1, "Folder With Unsaved Files")),
+            tooltip: ( localize(10054, "Folder With Unsaved Files")),
             alwaysVisible: true
         };
         this.dirtyRecentlyOpenedWorkspace = {
             ...this.dirtyRecentlyOpenedFolder,
-            tooltip: ( localizeWithPath(_moduleId, 2, "Workspace With Unsaved Files")),
+            tooltip: ( localize(10055, "Workspace With Unsaved Files")),
         };
     }
     async run(accessor) {
@@ -102,19 +101,17 @@ class BaseOpenRecentAction extends Action2 {
         const firstEntry = recentlyOpened.workspaces[0];
         const autoFocusSecondEntry = firstEntry && contextService.isCurrentWorkspace(isRecentWorkspace(firstEntry) ? firstEntry.workspace : firstEntry.folderUri);
         let keyMods;
-        const workspaceSeparator = { type: 'separator', label: hasWorkspaces ? ( localizeWithPath(_moduleId, 3, "folders & workspaces")) : ( localizeWithPath(_moduleId, 4, "folders")) };
-        const fileSeparator = { type: 'separator', label: ( localizeWithPath(_moduleId, 5, "files")) };
+        const workspaceSeparator = { type: 'separator', label: hasWorkspaces ? ( localize(10056, "folders & workspaces")) : ( localize(10057, "folders")) };
+        const fileSeparator = { type: 'separator', label: ( localize(10058, "files")) };
         const picks = [workspaceSeparator, ...workspacePicks, fileSeparator, ...filePicks];
         const pick = await quickInputService.pick(picks, {
             contextKey: inRecentFilesPickerContextKey,
             activeItem: [...workspacePicks, ...filePicks][autoFocusSecondEntry ? 1 : 0],
-            placeHolder: isMacintosh ? ( localizeWithPath(
-                _moduleId,
-                6,
+            placeHolder: isMacintosh ? ( localize(
+                10059,
                 "Select to open (hold Cmd-key to force new window or Option-key for same window)"
-            )) : ( localizeWithPath(
-                _moduleId,
-                7,
+            )) : ( localize(
+                10060,
                 "Select to open (hold Ctrl-key to force new window or Alt-key for same window)"
             )),
             matchOnDescription: true,
@@ -129,23 +126,13 @@ class BaseOpenRecentAction extends Action2 {
                 else if (context.button === this.dirtyRecentlyOpenedFolder || context.button === this.dirtyRecentlyOpenedWorkspace) {
                     const isDirtyWorkspace = context.button === this.dirtyRecentlyOpenedWorkspace;
                     const { confirmed } = await dialogService.confirm({
-                        title: isDirtyWorkspace ? ( localizeWithPath(_moduleId, 8, "Workspace with Unsaved Files")) : ( localizeWithPath(_moduleId, 9, "Folder with Unsaved Files")),
-                        message: isDirtyWorkspace ? ( localizeWithPath(
-                            _moduleId,
-                            10,
-                            "Do you want to open the workspace to review the unsaved files?"
-                        )) : ( localizeWithPath(
-                            _moduleId,
-                            11,
-                            "Do you want to open the folder to review the unsaved files?"
-                        )),
-                        detail: isDirtyWorkspace ? ( localizeWithPath(
-                            _moduleId,
-                            12,
+                        title: isDirtyWorkspace ? ( localize(10061, "Workspace with Unsaved Files")) : ( localize(10062, "Folder with Unsaved Files")),
+                        message: isDirtyWorkspace ? ( localize(10063, "Do you want to open the workspace to review the unsaved files?")) : ( localize(10064, "Do you want to open the folder to review the unsaved files?")),
+                        detail: isDirtyWorkspace ? ( localize(
+                            10065,
                             "Workspaces with unsaved files cannot be removed until all unsaved files have been saved or reverted."
-                        )) : ( localizeWithPath(
-                            _moduleId,
-                            13,
+                        )) : ( localize(
+                            10066,
                             "Folders with unsaved files cannot be removed until all unsaved files have been saved or reverted."
                         ))
                     });
@@ -195,7 +182,7 @@ class BaseOpenRecentAction extends Action2 {
         return {
             iconClasses,
             label: name,
-            ariaLabel: isDirty ? isWorkspace ? ( localizeWithPath(_moduleId, 14, "{0}, workspace with unsaved changes", name)) : ( localizeWithPath(_moduleId, 15, "{0}, folder with unsaved changes", name)) : name,
+            ariaLabel: isDirty ? isWorkspace ? ( localize(10067, "{0}, workspace with unsaved changes", name)) : ( localize(10068, "{0}, folder with unsaved changes", name)) : name,
             description: parentPath,
             buttons: isDirty ? [isWorkspace ? this.dirtyRecentlyOpenedWorkspace : this.dirtyRecentlyOpenedFolder] : [this.removeFromRecentlyOpened],
             openable,
@@ -210,8 +197,8 @@ class OpenRecentAction extends BaseOpenRecentAction {
         super({
             id: OpenRecentAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 16, "Open Recent...")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 17, "&&More...")),
+                ...( localize2(10069, "Open Recent...")),
+                mnemonicTitle: ( localize(10070, "&&More...")),
             },
             category: Categories.File,
             f1: true,
@@ -235,7 +222,7 @@ class QuickPickRecentAction extends BaseOpenRecentAction {
     constructor() {
         super({
             id: 'workbench.action.quickOpenRecent',
-            title: ( localize2WithPath(_moduleId, 18, 'Quick Open Recent...')),
+            title: ( localize2(10071, 'Quick Open Recent...')),
             category: Categories.File,
             f1: false
         });
@@ -249,8 +236,8 @@ class ToggleFullScreenAction extends Action2 {
         super({
             id: 'workbench.action.toggleFullScreen',
             title: {
-                ...( localize2WithPath(_moduleId, 19, "Toggle Full Screen")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 20, "&&Full Screen")),
+                ...( localize2(10072, "Toggle Full Screen")),
+                mnemonicTitle: ( localize(10073, "&&Full Screen")),
             },
             category: Categories.View,
             f1: true,
@@ -280,7 +267,7 @@ class ReloadWindowAction extends Action2 {
     constructor() {
         super({
             id: ReloadWindowAction.ID,
-            title: ( localize2WithPath(_moduleId, 21, 'Reload Window')),
+            title: ( localize2(10074, 'Reload Window')),
             category: Categories.Developer,
             f1: true,
             keybinding: {
@@ -300,8 +287,8 @@ class ShowAboutDialogAction extends Action2 {
         super({
             id: 'workbench.action.showAboutDialog',
             title: {
-                ...( localize2WithPath(_moduleId, 22, "About")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 23, "&&About")),
+                ...( localize2(10075, "About")),
+                mnemonicTitle: ( localize(10076, "&&About")),
             },
             category: Categories.Help,
             f1: true,
@@ -323,8 +310,8 @@ class NewWindowAction extends Action2 {
         super({
             id: 'workbench.action.newWindow',
             title: {
-                ...( localize2WithPath(_moduleId, 24, "New Window")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 25, "New &&Window")),
+                ...( localize2(10077, "New Window")),
+                mnemonicTitle: ( localize(10078, "New &&Window")),
             },
             f1: true,
             keybinding: {
@@ -348,7 +335,7 @@ class BlurAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.blur',
-            title: ( localize2WithPath(_moduleId, 26, 'Remove keyboard focus from focused element'))
+            title: ( localize2(10079, 'Remove keyboard focus from focused element'))
         });
     }
     run() {
@@ -396,14 +383,14 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: 'z_ConfirmClose',
     command: {
         id: 'workbench.action.toggleConfirmBeforeClose',
-        title: ( localizeWithPath(_moduleId, 27, "Confirm Before Close")),
+        title: ( localize(10080, "Confirm Before Close")),
         toggled: ( (ContextKeyExpr.notEquals('config.window.confirmBeforeClose', 'never')))
     },
     order: 1,
     when: IsWebContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    title: ( localizeWithPath(_moduleId, 28, "Open &&Recent")),
+    title: ( localize(10081, "Open &&Recent")),
     submenu: MenuId.MenubarRecentMenu,
     group: '2_open',
     order: 4

package/vscode/src/vs/workbench/browser/actions/workspaceActions.js

@@ -1,4 +1,4 @@
-import { localize2WithPath, localizeWithPath } from '../../../nls.js';
+import { localize2, localize } from '../../../nls.js';
 import { hasWorkspaceFileExtension, WorkbenchState } from '../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../platform/workspace/common/workspace.service.js';
 import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.service.js';
@@ -16,14 +16,13 @@ import { IWorkspacesService } from '../../../platform/workspaces/common/workspac
 import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
-const _moduleId = "vs/workbench/browser/actions/workspaceActions";
-const workspacesCategory = ( localize2WithPath(_moduleId, 0, 'Workspaces'));
+const workspacesCategory = ( localize2(5348, 'Workspaces'));
 class OpenFileAction extends Action2 {
     static { this.ID = 'workbench.action.files.openFile'; }
     constructor() {
         super({
             id: OpenFileAction.ID,
-            title: ( localize2WithPath(_moduleId, 1, 'Open File...')),
+            title: ( localize2(5349, 'Open File...')),
             category: Categories.File,
             f1: true,
             keybinding: {
@@ -43,7 +42,7 @@ class OpenFolderAction extends Action2 {
     constructor() {
         super({
             id: OpenFolderAction.ID,
-            title: ( localize2WithPath(_moduleId, 2, 'Open Folder...')),
+            title: ( localize2(5350, 'Open Folder...')),
             category: Categories.File,
             f1: true,
             precondition: OpenFolderWorkspaceSupportContext,
@@ -69,7 +68,7 @@ class OpenFolderViaWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: OpenFolderViaWorkspaceAction.ID,
-            title: ( localize2WithPath(_moduleId, 2, 'Open Folder...')),
+            title: ( localize2(5350, 'Open Folder...')),
             category: Categories.File,
             f1: true,
             precondition: ( (ContextKeyExpr.and(
@@ -89,7 +88,7 @@ class OpenFolderViaWorkspaceAction extends Action2 {
 }
 class OpenFileFolderAction extends Action2 {
     static { this.ID = 'workbench.action.files.openFileFolder'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 3, 'Open...')); }
+    static { this.LABEL = ( localize2(5351, 'Open...')); }
     constructor() {
         super({
             id: OpenFileFolderAction.ID,
@@ -113,7 +112,7 @@ class OpenWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspaceAction.ID,
-            title: ( localize2WithPath(_moduleId, 4, 'Open Workspace from File...')),
+            title: ( localize2(5352, 'Open Workspace from File...')),
             category: Categories.File,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -129,7 +128,7 @@ class CloseWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: CloseWorkspaceAction.ID,
-            title: ( localize2WithPath(_moduleId, 5, 'Close Workspace')),
+            title: ( localize2(5353, 'Close Workspace')),
             category: workspacesCategory,
             f1: true,
             precondition: ( (ContextKeyExpr.and(
@@ -153,7 +152,7 @@ class OpenWorkspaceConfigFileAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspaceConfigFileAction.ID,
-            title: ( localize2WithPath(_moduleId, 6, 'Open Workspace Configuration File')),
+            title: ( localize2(5354, 'Open Workspace Configuration File')),
             category: workspacesCategory,
             f1: true,
             precondition: ( (WorkbenchStateContext.isEqualTo('workspace')))
@@ -192,7 +191,7 @@ class RemoveRootFolderAction extends Action2 {
     constructor() {
         super({
             id: RemoveRootFolderAction.ID,
-            title: ( localize2WithPath(_moduleId, 7, 'Remove Folder from Workspace...')),
+            title: ( localize2(5355, 'Remove Folder from Workspace...')),
             category: workspacesCategory,
             f1: true,
             precondition: ( (ContextKeyExpr.and(
@@ -218,7 +217,7 @@ class SaveWorkspaceAsAction extends Action2 {
     constructor() {
         super({
             id: SaveWorkspaceAsAction.ID,
-            title: ( localize2WithPath(_moduleId, 8, 'Save Workspace As...')),
+            title: ( localize2(5356, 'Save Workspace As...')),
             category: workspacesCategory,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -246,7 +245,7 @@ class DuplicateWorkspaceInNewWindowAction extends Action2 {
     constructor() {
         super({
             id: DuplicateWorkspaceInNewWindowAction.ID,
-            title: ( localize2WithPath(_moduleId, 9, 'Duplicate As Workspace in New Window')),
+            title: ( localize2(5357, 'Duplicate As Workspace in New Window')),
             category: workspacesCategory,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -280,7 +279,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '2_open',
     command: {
         id: OpenFileAction.ID,
-        title: ( localizeWithPath(_moduleId, 10, "&&Open File..."))
+        title: ( localize(5358, "&&Open File..."))
     },
     order: 1,
     when: ( (IsMacNativeContext.toNegated()))
@@ -289,7 +288,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '2_open',
     command: {
         id: OpenFolderAction.ID,
-        title: ( localizeWithPath(_moduleId, 11, "Open &&Folder..."))
+        title: ( localize(5359, "Open &&Folder..."))
     },
     order: 2,
     when: OpenFolderWorkspaceSupportContext
@@ -298,7 +297,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '2_open',
     command: {
         id: OpenFolderViaWorkspaceAction.ID,
-        title: ( localizeWithPath(_moduleId, 11, "Open &&Folder..."))
+        title: ( localize(5359, "Open &&Folder..."))
     },
     order: 2,
     when: ( (ContextKeyExpr.and(
@@ -310,7 +309,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '2_open',
     command: {
         id: OpenFileFolderAction.ID,
-        title: ( localizeWithPath(_moduleId, 12, "&&Open..."))
+        title: ( localize(5360, "&&Open..."))
     },
     order: 1,
     when: ( (ContextKeyExpr.and(IsMacNativeContext, OpenFolderWorkspaceSupportContext)))
@@ -319,7 +318,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '2_open',
     command: {
         id: OpenWorkspaceAction.ID,
-        title: ( localizeWithPath(_moduleId, 13, "Open Wor&&kspace from File..."))
+        title: ( localize(5361, "Open Wor&&kspace from File..."))
     },
     order: 3,
     when: EnterMultiRootWorkspaceSupportContext
@@ -328,7 +327,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '3_workspace',
     command: {
         id: ADD_ROOT_FOLDER_COMMAND_ID,
-        title: ( localizeWithPath(_moduleId, 14, "A&&dd Folder to Workspace..."))
+        title: ( localize(5362, "A&&dd Folder to Workspace..."))
     },
     when: ( (ContextKeyExpr.or(
         EnterMultiRootWorkspaceSupportContext,
@@ -340,7 +339,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '3_workspace',
     command: {
         id: SaveWorkspaceAsAction.ID,
-        title: ( localizeWithPath(_moduleId, 15, "Save Workspace As..."))
+        title: ( localize(5363, "Save Workspace As..."))
     },
     order: 2,
     when: EnterMultiRootWorkspaceSupportContext
@@ -349,7 +348,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '3_workspace',
     command: {
         id: DuplicateWorkspaceInNewWindowAction.ID,
-        title: ( localizeWithPath(_moduleId, 16, "Duplicate Workspace"))
+        title: ( localize(5364, "Duplicate Workspace"))
     },
     order: 3,
     when: EnterMultiRootWorkspaceSupportContext
@@ -358,7 +357,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '6_close',
     command: {
         id: CloseWorkspaceAction.ID,
-        title: ( localizeWithPath(_moduleId, 17, "Close &&Folder"))
+        title: ( localize(5365, "Close &&Folder"))
     },
     order: 3,
     when: ( (ContextKeyExpr.and(
@@ -370,7 +369,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
     group: '6_close',
     command: {
         id: CloseWorkspaceAction.ID,
-        title: ( localizeWithPath(_moduleId, 18, "Close &&Workspace"))
+        title: ( localize(5366, "Close &&Workspace"))
     },
     order: 3,
     when: ( (ContextKeyExpr.and(

package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js

@@ -1,4 +1,4 @@
-import { localizeWithPath, localize2WithPath } from '../../../nls.js';
+import { localize, localize2 } from '../../../nls.js';
 import { hasWorkspaceFileExtension } from '../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../platform/workspace/common/workspace.service.js';
 import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.service.js';
@@ -18,9 +18,8 @@ import { URI } from '../../../base/common/uri.js';
 import { Schemas } from '../../../base/common/network.js';
 import { IWorkspacesService } from '../../../platform/workspaces/common/workspaces.service.js';
 import { IPathService } from '../../services/path/common/pathService.service.js';
-const _moduleId = "vs/workbench/browser/actions/workspaceCommands";
 const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
-const ADD_ROOT_FOLDER_LABEL = ( localize2WithPath(_moduleId, 0, 'Add Folder to Workspace...'));
+const ADD_ROOT_FOLDER_LABEL = ( localize2(5482, 'Add Folder to Workspace...'));
 const SET_ROOT_FOLDER_COMMAND_ID = 'setRootFolder';
 const PICK_WORKSPACE_FOLDER_COMMAND_ID = '_workbench.pickWorkspaceFolder';
 CommandsRegistry.registerCommand({
@@ -70,8 +69,8 @@ async function selectWorkspaceFolders(accessor) {
     const dialogsService = accessor.get(IFileDialogService);
     const pathService = accessor.get(IPathService);
     const folders = await dialogsService.showOpenDialog({
-        openLabel: mnemonicButtonLabel(( localizeWithPath(_moduleId, 1, "&&Add"))),
-        title: ( localizeWithPath(_moduleId, 2, "Add Folder to Workspace")),
+        openLabel: mnemonicButtonLabel(( localize(5483, "&&Add"))),
+        title: ( localize(5484, "Add Folder to Workspace")),
         canSelectFolders: true,
         canSelectMany: true,
         defaultUri: await dialogsService.defaultFolderPath(),
@@ -104,7 +103,7 @@ CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, async functio
         options.activeItem = folderPicks[0];
     }
     if (!options.placeHolder) {
-        options.placeHolder = ( localizeWithPath(_moduleId, 3, "Select workspace folder"));
+        options.placeHolder = ( localize(5485, "Select workspace folder"));
     }
     if (typeof options.matchOnDescription !== 'boolean') {
         options.matchOnDescription = true;

package/vscode/src/vs/workbench/browser/actions.js

@@ -64,9 +64,8 @@ let CompositeMenuActions = class CompositeMenuActions extends Disposable {
     getContextMenuActions() {
         const actions = [];
         if (this.contextMenuId) {
-            const menu = this.menuService.createMenu(this.contextMenuId, this.contextKeyService);
-            createAndFillInActionBarActions(menu, this.options, { primary: [], secondary: actions });
-            menu.dispose();
+            const menu = this.menuService.getMenuActions(this.contextMenuId, this.contextKeyService, this.options);
+            createAndFillInActionBarActions(menu, { primary: [], secondary: actions });
         }
         return actions;
     }

package/vscode/src/vs/workbench/browser/editor.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../nls.js';
+import { localize } from '../../nls.js';
 import { EditorExtensions, EditorCloseContext, EditorResourceAccessor, SideBySideEditor } from '../common/editor.js';
 import { Registry } from '../../platform/registry/common/platform.js';
 import { toDisposable } from '../../base/common/lifecycle.js';
@@ -9,7 +9,6 @@ import { IWorkingCopyService } from '../services/workingCopy/common/workingCopyS
 import { Schemas } from '../../base/common/network.js';
 import { Iterable } from '../../base/common/iterator.js';
 import { Emitter } from '../../base/common/event.js';
-const _moduleId = "vs/workbench/browser/editor";
 class EditorPaneDescriptor {
     static { this.instantiatedEditorPanes = ( (new Set())); }
     static didInstantiateEditorPane(typeId) {
@@ -158,10 +157,10 @@ function whenEditorClosed(accessor, resources) {
 function computeEditorAriaLabel(input, index, group, groupCount) {
     let ariaLabel = input.getAriaLabel();
     if (group && !group.isPinned(input)) {
-        ariaLabel = ( localizeWithPath(_moduleId, 0, "{0}, preview", ariaLabel));
+        ariaLabel = ( localize(4549, "{0}, preview", ariaLabel));
     }
     if (group?.isSticky(index ?? input)) {
-        ariaLabel = ( localizeWithPath(_moduleId, 1, "{0}, pinned", ariaLabel));
+        ariaLabel = ( localize(4550, "{0}, pinned", ariaLabel));
     }
     if (group && typeof groupCount === 'number' && groupCount > 1) {
         ariaLabel = `${ariaLabel}, ${group.ariaLabel}`;

package/vscode/src/vs/workbench/browser/labels.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 { URI } from '../../base/common/uri.js';
 import { isEqual, basenameOrAuthority, dirname } from '../../base/common/resources.js';
 import { IconLabel } from '../../base/browser/ui/iconLabel/iconLabel.js';
@@ -19,7 +19,6 @@ import { Disposable, dispose, MutableDisposable } from '../../base/common/lifecy
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
 import { normalizeDriveLetter } from '../../base/common/labels.js';
 import { INotebookDocumentService } from '../services/notebook/common/notebookDocumentService.service.js';
-const _moduleId = "vs/workbench/browser/labels";
 function toResource(props) {
     if (!props || !props.resource) {
         return undefined;
@@ -310,10 +309,10 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
             const notebookDocument = this.notebookDocumentService.getNotebook(resource);
             const cellIndex = notebookDocument?.getCellIndex(resource);
             if (notebookDocument && cellIndex !== undefined && typeof label.name === 'string') {
-                options.title = ( localizeWithPath(_moduleId, 0, "{0} • Cell {1}", label.name, `${cellIndex + 1}`));
+                options.title = ( localize(9963, "{0} • Cell {1}", label.name, `${cellIndex + 1}`));
             }
             if (typeof label.name === 'string' && notebookDocument && cellIndex !== undefined && typeof label.name === 'string') {
-                label.name = ( localizeWithPath(_moduleId, 0, "{0} • Cell {1}", label.name, `${cellIndex + 1}`));
+                label.name = ( localize(9963, "{0} • Cell {1}", label.name, `${cellIndex + 1}`));
             }
         }
         const hasResourceChanged = this.hasResourceChanged(label);

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

@@ -1,5 +1,5 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
@@ -11,26 +11,21 @@ import { IWorkbenchLayoutService } from '../../../services/layout/browser/layout
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
-const _moduleId = "vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions";
-const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, ( localizeWithPath(
-    _moduleId,
-    0,
-    'Icon to toggle the auxiliary bar off in its right position.'
-)));
-const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, ( localizeWithPath(_moduleId, 1, 'Icon to toggle the auxiliary bar on in its right position.')));
-const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codicon.layoutSidebarLeft, ( localizeWithPath(_moduleId, 2, 'Icon to toggle the auxiliary bar in its left position.')));
-const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon', Codicon.layoutSidebarLeftOff, ( localizeWithPath(_moduleId, 3, 'Icon to toggle the auxiliary bar on in its left position.')));
+const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, ( localize(9314, 'Icon to toggle the auxiliary bar off in its right position.')));
+const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, ( localize(9315, 'Icon to toggle the auxiliary bar on in its right position.')));
+const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codicon.layoutSidebarLeft, ( localize(9316, 'Icon to toggle the auxiliary bar in its left position.')));
+const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon', Codicon.layoutSidebarLeftOff, ( localize(9317, 'Icon to toggle the auxiliary bar on in its left position.')));
 class ToggleAuxiliaryBarAction extends Action2 {
     static { this.ID = 'workbench.action.toggleAuxiliaryBar'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 4, "Toggle Secondary Side Bar Visibility")); }
+    static { this.LABEL = ( localize2(9318, "Toggle Secondary Side Bar Visibility")); }
     constructor() {
         super({
             id: ToggleAuxiliaryBarAction.ID,
             title: ToggleAuxiliaryBarAction.LABEL,
             toggled: {
                 condition: AuxiliaryBarVisibleContext,
-                title: ( localizeWithPath(_moduleId, 5, "Secondary Side Bar")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 6, "Secondary Si&&de Bar")),
+                title: ( localize(9319, "Secondary Side Bar")),
+                mnemonicTitle: ( localize(9320, "Secondary Si&&de Bar")),
             },
             category: Categories.View,
             f1: true,
@@ -60,7 +55,7 @@ class ToggleAuxiliaryBarAction extends Action2 {
 registerAction2(ToggleAuxiliaryBarAction);
 registerAction2(class FocusAuxiliaryBarAction extends Action2 {
     static { this.ID = 'workbench.action.focusAuxiliaryBar'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 7, "Focus into Secondary Side Bar")); }
+    static { this.LABEL = ( localize2(9321, "Focus into Secondary Side Bar")); }
     constructor() {
         super({
             id: FocusAuxiliaryBarAction.ID,
@@ -86,7 +81,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localizeWithPath(_moduleId, 8, "Toggle Secondary Side Bar")),
+                title: ( localize(9322, "Toggle Secondary Side Bar")),
                 toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarLeftIcon },
                 icon: auxiliaryBarLeftOffIcon,
             },
@@ -102,7 +97,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localizeWithPath(_moduleId, 8, "Toggle Secondary Side Bar")),
+                title: ( localize(9322, "Toggle Secondary Side Bar")),
                 toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarRightIcon },
                 icon: auxiliaryBarRightOffIcon,
             },
@@ -118,7 +113,7 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localize2WithPath(_moduleId, 9, 'Hide Secondary Side Bar')),
+                title: ( localize2(9323, 'Hide Secondary Side Bar')),
             },
             when: ( (ContextKeyExpr.and(AuxiliaryBarVisibleContext,  (ContextKeyExpr.equals(
                 'viewLocation',