@codingame/monaco-vscode-api 1.83.2 → 1.83.3-next.0

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

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService, ItemActivation } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
@@ -102,7 +102,7 @@ registerAction2(class QuickAccessAction extends Action2 {
         super({
             id: 'workbench.action.quickOpen',
             title: {
-                value: ( localize('quickOpen', "Go to File...")),
+                value: localizeWithPath('vs/workbench/browser/actions/quickAccessActions', 'quickOpen', "Go to File..."),
                 original: 'Go to File...'
             },
             description: {
@@ -132,7 +132,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpenWithModes',
-            title: ( localize('quickOpenWithModes', "Quick Open")),
+            title: localizeWithPath('vs/workbench/browser/actions/quickAccessActions', 'quickOpenWithModes', "Quick Open"),
             icon: Codicon.search,
             menu: {
                 id: MenuId.CommandCenterCenter,
@@ -172,17 +172,17 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', { value: ( localize('quickNavigateNext', "Navigate Next in Quick Open")), original: 'Navigate Next in Quick Open' }, true, true);
+        super('workbench.action.quickOpenNavigateNext', { value: localizeWithPath('vs/workbench/browser/actions/quickAccessActions', 'quickNavigateNext', "Navigate Next in Quick Open"), original: 'Navigate Next in Quick Open' }, true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', { value: ( localize('quickNavigatePrevious', "Navigate Previous in Quick Open")), original: 'Navigate Previous in Quick Open' }, false, true);
+        super('workbench.action.quickOpenNavigatePrevious', { value: localizeWithPath('vs/workbench/browser/actions/quickAccessActions', 'quickNavigatePrevious', "Navigate Previous in Quick Open"), original: 'Navigate Previous in Quick Open' }, false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', { value: ( localize('quickSelectNext', "Select Next in Quick Open")), original: 'Select Next in Quick Open' }, true, false, {
+        super('workbench.action.quickOpenSelectNext', { value: localizeWithPath('vs/workbench/browser/actions/quickAccessActions', 'quickSelectNext', "Select Next in Quick Open"), original: 'Select Next in Quick Open' }, true, false, {
             weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,
@@ -192,7 +192,7 @@ class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', { value: ( localize('quickSelectPrevious', "Select Previous in Quick Open")), original: 'Select Previous in Quick Open' }, false, false, {
+        super('workbench.action.quickOpenSelectPrevious', { value: localizeWithPath('vs/workbench/browser/actions/quickAccessActions', 'quickSelectPrevious', "Select Previous in Quick Open"), original: 'Select Previous in Quick Open' }, false, false, {
             weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,

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

@@ -1,7 +1,7 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { MenuId, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IsDevelopmentContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
+import { MenuId, Action2, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { IsDevelopmentContext, IsWebContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
@@ -31,16 +31,16 @@ class BaseOpenRecentAction extends Action2 {
         super(desc);
         this.removeFromRecentlyOpened = {
             iconClass: ThemeIcon.asClassName(Codicon.removeClose),
-            tooltip: ( localize('remove', "Remove from Recently Opened"))
+            tooltip: localizeWithPath('vs/workbench/browser/actions/windowActions', 'remove', "Remove from Recently Opened")
         };
         this.dirtyRecentlyOpenedFolder = {
             iconClass: 'dirty-workspace ' + ThemeIcon.asClassName(Codicon.closeDirty),
-            tooltip: ( localize('dirtyRecentlyOpenedFolder', "Folder With Unsaved Files")),
+            tooltip: localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyRecentlyOpenedFolder', "Folder With Unsaved Files"),
             alwaysVisible: true
         };
         this.dirtyRecentlyOpenedWorkspace = {
             ...this.dirtyRecentlyOpenedFolder,
-            tooltip: ( localize('dirtyRecentlyOpenedWorkspace', "Workspace With Unsaved Files")),
+            tooltip: localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyRecentlyOpenedWorkspace', "Workspace With Unsaved Files"),
         };
     }
     async run(accessor) {
@@ -97,19 +97,13 @@ 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 ? ( localize('workspacesAndFolders', "folders & workspaces")) : ( localize('folders', "folders")) };
-        const fileSeparator = { type: 'separator', label: ( localize('files', "files")) };
+        const workspaceSeparator = { type: 'separator', label: hasWorkspaces ? localizeWithPath('vs/workbench/browser/actions/windowActions', 'workspacesAndFolders', "folders & workspaces") : localizeWithPath('vs/workbench/browser/actions/windowActions', 'folders', "folders") };
+        const fileSeparator = { type: 'separator', label: localizeWithPath('vs/workbench/browser/actions/windowActions', 'files', "files") };
         const picks = [workspaceSeparator, ...workspacePicks, fileSeparator, ...filePicks];
         const pick = await quickInputService.pick(picks, {
             contextKey: inRecentFilesPickerContextKey,
             activeItem: [...workspacePicks, ...filePicks][autoFocusSecondEntry ? 1 : 0],
-            placeHolder: isMacintosh ? ( localize(
-                'openRecentPlaceholderMac',
-                "Select to open (hold Cmd-key to force new window or Option-key for same window)"
-            )) : ( localize(
-                'openRecentPlaceholder',
-                "Select to open (hold Ctrl-key to force new window or Alt-key for same window)"
-            )),
+            placeHolder: isMacintosh ? localizeWithPath('vs/workbench/browser/actions/windowActions', 'openRecentPlaceholderMac', "Select to open (hold Cmd-key to force new window or Option-key for same window)") : localizeWithPath('vs/workbench/browser/actions/windowActions', 'openRecentPlaceholder', "Select to open (hold Ctrl-key to force new window or Alt-key for same window)"),
             matchOnDescription: true,
             onKeyMods: mods => keyMods = mods,
             quickNavigate: this.isQuickNavigate() ? { keybindings: keybindingService.lookupKeybindings(this.desc.id) } : undefined,
@@ -122,21 +116,9 @@ 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 ? ( localize('dirtyWorkspace', "Workspace with Unsaved Files")) : ( localize('dirtyFolder', "Folder with Unsaved Files")),
-                        message: isDirtyWorkspace ? ( localize(
-                            'dirtyWorkspaceConfirm',
-                            "Do you want to open the workspace to review the unsaved files?"
-                        )) : ( localize(
-                            'dirtyFolderConfirm',
-                            "Do you want to open the folder to review the unsaved files?"
-                        )),
-                        detail: isDirtyWorkspace ? ( localize(
-                            'dirtyWorkspaceConfirmDetail',
-                            "Workspaces with unsaved files cannot be removed until all unsaved files have been saved or reverted."
-                        )) : ( localize(
-                            'dirtyFolderConfirmDetail',
-                            "Folders with unsaved files cannot be removed until all unsaved files have been saved or reverted."
-                        ))
+                        title: isDirtyWorkspace ? localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyWorkspace', "Workspace with Unsaved Files") : localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyFolder', "Folder with Unsaved Files"),
+                        message: isDirtyWorkspace ? localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyWorkspaceConfirm', "Do you want to open the workspace to review the unsaved files?") : localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyFolderConfirm', "Do you want to open the folder to review the unsaved files?"),
+                        detail: isDirtyWorkspace ? localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyWorkspaceConfirmDetail', "Workspaces with unsaved files cannot be removed until all unsaved files have been saved or reverted.") : localizeWithPath('vs/workbench/browser/actions/windowActions', 'dirtyFolderConfirmDetail', "Folders with unsaved files cannot be removed until all unsaved files have been saved or reverted.")
                     });
                     if (confirmed) {
                         hostService.openWindow([context.item.openable], {
@@ -184,11 +166,7 @@ class BaseOpenRecentAction extends Action2 {
         return {
             iconClasses,
             label: name,
-            ariaLabel: isDirty ? isWorkspace ? ( localize(
-                'recentDirtyWorkspaceAriaLabel',
-                "{0}, workspace with unsaved changes",
-                name
-            )) : ( localize('recentDirtyFolderAriaLabel', "{0}, folder with unsaved changes", name)) : name,
+            ariaLabel: isDirty ? isWorkspace ? localizeWithPath('vs/workbench/browser/actions/windowActions', 'recentDirtyWorkspaceAriaLabel', "{0}, workspace with unsaved changes", name) : localizeWithPath('vs/workbench/browser/actions/windowActions', 'recentDirtyFolderAriaLabel', "{0}, folder with unsaved changes", name) : name,
             description: parentPath,
             buttons: isDirty ? [isWorkspace ? this.dirtyRecentlyOpenedWorkspace : this.dirtyRecentlyOpenedFolder] : [this.removeFromRecentlyOpened],
             openable,
@@ -203,8 +181,8 @@ class OpenRecentAction extends BaseOpenRecentAction {
         super({
             id: OpenRecentAction.ID,
             title: {
-                value: ( localize('openRecent', "Open Recent...")),
-                mnemonicTitle: ( localize({ key: 'miMore', comment: ['&& denotes a mnemonic'] }, "&&More...")),
+                value: localizeWithPath('vs/workbench/browser/actions/windowActions', 'openRecent', "Open Recent..."),
+                mnemonicTitle: localizeWithPath('vs/workbench/browser/actions/windowActions', { key: 'miMore', comment: ['&& denotes a mnemonic'] }, "&&More..."),
                 original: 'Open Recent...'
             },
             category: Categories.File,
@@ -230,7 +208,7 @@ class ReloadWindowAction extends Action2 {
     constructor() {
         super({
             id: ReloadWindowAction.ID,
-            title: { value: ( localize('reloadWindow', "Reload Window")), original: 'Reload Window' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/windowActions', 'reloadWindow', "Reload Window"), original: 'Reload Window' },
             category: Categories.Developer,
             f1: true,
             keybinding: {
@@ -269,4 +247,20 @@ CommandsRegistry.registerCommand('workbench.action.toggleConfirmBeforeClose', ac
     const setting = configurationService.inspect('window.confirmBeforeClose').userValue;
     return configurationService.updateValue('window.confirmBeforeClose', setting === 'never' ? 'keyboardOnly' : 'never');
 });
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: 'z_ConfirmClose',
+    command: {
+        id: 'workbench.action.toggleConfirmBeforeClose',
+        title: localizeWithPath('vs/workbench/browser/actions/windowActions', 'miConfirmClose', "Confirm Before Close"),
+        toggled: ( ContextKeyExpr.notEquals('config.window.confirmBeforeClose', 'never'))
+    },
+    order: 1,
+    when: IsWebContext
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    title: localizeWithPath('vs/workbench/browser/actions/windowActions', { key: 'miOpenRecent', comment: ['&& denotes a mnemonic'] }, "Open &&Recent"),
+    submenu: MenuId.MenubarRecentMenu,
+    group: '2_open',
+    order: 4
+}));
 export { OpenRecentAction, ReloadWindowAction, inRecentFilesPickerContextKey };

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

@@ -1,11 +1,11 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IWorkspaceContextService, hasWorkspaceFileExtension } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { IWorkspaceEditingService } from '../../services/workspaces/common/workspaceEditing.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { SET_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, ADD_ROOT_FOLDER_COMMAND_ID, PICK_WORKSPACE_FOLDER_COMMAND_ID } from './workspaceCommands.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { Action2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { OpenFolderWorkspaceSupportContext, WorkbenchStateContext, EnterMultiRootWorkspaceSupportContext, EmptyWorkspaceSupportContext, WorkspaceFolderCountContext } from '../../common/contextkeys.js';
 import { IHostService } from '../../services/host/browser/host.js';
 import { KeyChord } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
@@ -15,13 +15,13 @@ import { IWorkspacesService } from '../../../platform/workspaces/common/workspac
 import { IsMacNativeContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
 import { IFileDialogService } from '../../../platform/dialogs/common/dialogs.js';
-const workspacesCategory = { value: ( localize('workspaces', "Workspaces")), original: 'Workspaces' };
+const workspacesCategory = { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'workspaces', "Workspaces"), original: 'Workspaces' };
 class OpenFileAction extends Action2 {
     static { this.ID = 'workbench.action.files.openFile'; }
     constructor() {
         super({
             id: OpenFileAction.ID,
-            title: { value: ( localize('openFile', "Open File...")), original: 'Open File...' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'openFile', "Open File..."), original: 'Open File...' },
             category: Categories.File,
             f1: true,
             precondition: ( IsMacNativeContext.toNegated()),
@@ -41,7 +41,7 @@ class OpenFolderAction extends Action2 {
     constructor() {
         super({
             id: OpenFolderAction.ID,
-            title: { value: ( localize('openFolder', "Open Folder...")), original: 'Open Folder...' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'openFolder', "Open Folder..."), original: 'Open Folder...' },
             category: Categories.File,
             f1: true,
             precondition: OpenFolderWorkspaceSupportContext,
@@ -67,7 +67,7 @@ class OpenFolderViaWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: OpenFolderViaWorkspaceAction.ID,
-            title: { value: ( localize('openFolder', "Open Folder...")), original: 'Open Folder...' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'openFolder', "Open Folder..."), original: 'Open Folder...' },
             category: Categories.File,
             f1: true,
             precondition: ( ContextKeyExpr.and(( OpenFolderWorkspaceSupportContext.toNegated()), ( WorkbenchStateContext.isEqualTo('workspace')))),
@@ -84,7 +84,7 @@ class OpenFolderViaWorkspaceAction extends Action2 {
 }
 class OpenFileFolderAction extends Action2 {
     static { this.ID = 'workbench.action.files.openFileFolder'; }
-    static { this.LABEL = { value: ( localize('openFileFolder', "Open...")), original: 'Open...' }; }
+    static { this.LABEL = { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'openFileFolder', "Open..."), original: 'Open...' }; }
     constructor() {
         super({
             id: OpenFileFolderAction.ID,
@@ -108,7 +108,7 @@ class OpenWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspaceAction.ID,
-            title: { value: ( localize('openWorkspaceAction', "Open Workspace from File...")), original: 'Open Workspace from File...' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'openWorkspaceAction', "Open Workspace from File..."), original: 'Open Workspace from File...' },
             category: Categories.File,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -124,7 +124,7 @@ class CloseWorkspaceAction extends Action2 {
     constructor() {
         super({
             id: CloseWorkspaceAction.ID,
-            title: { value: ( localize('closeWorkspace', "Close Workspace")), original: 'Close Workspace' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'closeWorkspace', "Close Workspace"), original: 'Close Workspace' },
             category: workspacesCategory,
             f1: true,
             precondition: ( ContextKeyExpr.and(( WorkbenchStateContext.notEqualsTo('empty')), EmptyWorkspaceSupportContext)),
@@ -145,7 +145,7 @@ class OpenWorkspaceConfigFileAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkspaceConfigFileAction.ID,
-            title: { value: ( localize('openWorkspaceConfigFile', "Open Workspace Configuration File")), original: 'Open Workspace Configuration File' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'openWorkspaceConfigFile', "Open Workspace Configuration File"), original: 'Open Workspace Configuration File' },
             category: workspacesCategory,
             f1: true,
             precondition: ( WorkbenchStateContext.isEqualTo('workspace'))
@@ -181,7 +181,7 @@ class RemoveRootFolderAction extends Action2 {
     constructor() {
         super({
             id: RemoveRootFolderAction.ID,
-            title: { value: ( localize('globalRemoveFolderFromWorkspace', "Remove Folder from Workspace...")), original: 'Remove Folder from Workspace...' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'globalRemoveFolderFromWorkspace', "Remove Folder from Workspace..."), original: 'Remove Folder from Workspace...' },
             category: workspacesCategory,
             f1: true,
             precondition: ( ContextKeyExpr.and(( WorkspaceFolderCountContext.notEqualsTo('0')), ( ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, ( WorkbenchStateContext.isEqualTo('workspace'))))))
@@ -201,7 +201,7 @@ class SaveWorkspaceAsAction extends Action2 {
     constructor() {
         super({
             id: SaveWorkspaceAsAction.ID,
-            title: { value: ( localize('saveWorkspaceAsAction', "Save Workspace As...")), original: 'Save Workspace As...' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'saveWorkspaceAsAction', "Save Workspace As..."), original: 'Save Workspace As...' },
             category: workspacesCategory,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -229,7 +229,7 @@ class DuplicateWorkspaceInNewWindowAction extends Action2 {
     constructor() {
         super({
             id: DuplicateWorkspaceInNewWindowAction.ID,
-            title: { value: ( localize('duplicateWorkspaceInNewWindow', "Duplicate As Workspace in New Window")), original: 'Duplicate As Workspace in New Window' },
+            title: { value: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'duplicateWorkspaceInNewWindow', "Duplicate As Workspace in New Window"), original: 'Duplicate As Workspace in New Window' },
             category: workspacesCategory,
             f1: true,
             precondition: EnterMultiRootWorkspaceSupportContext
@@ -248,4 +248,94 @@ class DuplicateWorkspaceInNewWindowAction extends Action2 {
         return hostService.openWindow([{ workspaceUri: newWorkspace.configPath }], { forceNewWindow: true, remoteAuthority });
     }
 }
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '2_open',
+    command: {
+        id: OpenFileAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miOpenFile', comment: ['&& denotes a mnemonic'] }, "&&Open File...")
+    },
+    order: 1,
+    when: ( IsMacNativeContext.toNegated())
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '2_open',
+    command: {
+        id: OpenFolderAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miOpenFolder', comment: ['&& denotes a mnemonic'] }, "Open &&Folder...")
+    },
+    order: 2,
+    when: OpenFolderWorkspaceSupportContext
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '2_open',
+    command: {
+        id: OpenFolderViaWorkspaceAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miOpenFolder', comment: ['&& denotes a mnemonic'] }, "Open &&Folder...")
+    },
+    order: 2,
+    when: ( ContextKeyExpr.and(( OpenFolderWorkspaceSupportContext.toNegated()), ( WorkbenchStateContext.isEqualTo('workspace'))))
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '2_open',
+    command: {
+        id: OpenFileFolderAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miOpen', comment: ['&& denotes a mnemonic'] }, "&&Open...")
+    },
+    order: 1,
+    when: ( ContextKeyExpr.and(IsMacNativeContext, OpenFolderWorkspaceSupportContext))
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '2_open',
+    command: {
+        id: OpenWorkspaceAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miOpenWorkspace', comment: ['&& denotes a mnemonic'] }, "Open Wor&&kspace from File...")
+    },
+    order: 3,
+    when: EnterMultiRootWorkspaceSupportContext
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '3_workspace',
+    command: {
+        id: ADD_ROOT_FOLDER_COMMAND_ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miAddFolderToWorkspace', comment: ['&& denotes a mnemonic'] }, "A&&dd Folder to Workspace...")
+    },
+    when: ( ContextKeyExpr.or(EnterMultiRootWorkspaceSupportContext, ( WorkbenchStateContext.isEqualTo('workspace')))),
+    order: 1
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '3_workspace',
+    command: {
+        id: SaveWorkspaceAsAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'miSaveWorkspaceAs', "Save Workspace As...")
+    },
+    order: 2,
+    when: EnterMultiRootWorkspaceSupportContext
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '3_workspace',
+    command: {
+        id: DuplicateWorkspaceInNewWindowAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', 'duplicateWorkspace', "Duplicate Workspace")
+    },
+    order: 3,
+    when: EnterMultiRootWorkspaceSupportContext
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '6_close',
+    command: {
+        id: CloseWorkspaceAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miCloseFolder', comment: ['&& denotes a mnemonic'] }, "Close &&Folder")
+    },
+    order: 3,
+    when: ( ContextKeyExpr.and(( WorkbenchStateContext.isEqualTo('folder')), EmptyWorkspaceSupportContext))
+}));
+( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+    group: '6_close',
+    command: {
+        id: CloseWorkspaceAction.ID,
+        title: localizeWithPath('vs/workbench/browser/actions/workspaceActions', { key: 'miCloseWorkspace', comment: ['&& denotes a mnemonic'] }, "Close &&Workspace")
+    },
+    order: 3,
+    when: ( ContextKeyExpr.and(( WorkbenchStateContext.isEqualTo('workspace')), EmptyWorkspaceSupportContext))
+}));
 export { AddRootFolderAction, OpenFileAction, OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction, RemoveRootFolderAction };

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

@@ -1,7 +1,7 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder';
-const ADD_ROOT_FOLDER_LABEL = { value: ( localize('addFolderToWorkspace', "Add Folder to Workspace...")), original: 'Add Folder to Workspace...' };
+const ADD_ROOT_FOLDER_LABEL = { value: localizeWithPath('vs/workbench/browser/actions/workspaceCommands', 'addFolderToWorkspace', "Add Folder to Workspace..."), original: 'Add Folder to Workspace...' };
 const SET_ROOT_FOLDER_COMMAND_ID = 'setRootFolder';
 const PICK_WORKSPACE_FOLDER_COMMAND_ID = '_workbench.pickWorkspaceFolder';
 export { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, PICK_WORKSPACE_FOLDER_COMMAND_ID, SET_ROOT_FOLDER_COMMAND_ID };

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

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { EditorExtensions, EditorCloseContext, EditorResourceAccessor, SideBySideEditor } from '../common/editor.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
@@ -141,10 +141,10 @@ function whenEditorClosed(accessor, resources) {
 function computeEditorAriaLabel(input, index, group, groupCount) {
     let ariaLabel = input.getAriaLabel();
     if (group && !group.isPinned(input)) {
-        ariaLabel = ( localize('preview', "{0}, preview", ariaLabel));
+        ariaLabel = localizeWithPath('vs/workbench/browser/editor', 'preview', "{0}, preview", ariaLabel);
     }
     if (group?.isSticky(index ?? input)) {
-        ariaLabel = ( localize('pinned', "{0}, pinned", ariaLabel));
+        ariaLabel = localizeWithPath('vs/workbench/browser/editor', 'pinned', "{0}, pinned", ariaLabel);
     }
     if (group && typeof groupCount === 'number' && groupCount > 1) {
         ariaLabel = `${ariaLabel}, ${group.ariaLabel}`;

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

@@ -1,5 +1,5 @@
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action2, MenuId, registerAction2, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
@@ -8,36 +8,21 @@ import { AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
 import { ViewContainerLocationToString } from '../../../common/views.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
-const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, ( localize(
-    'toggleAuxiliaryIconRight',
-    'Icon to toggle the auxiliary bar off in its right position.'
-)));
-const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, ( localize(
-    'toggleAuxiliaryIconRightOn',
-    'Icon to toggle the auxiliary bar on in its right position.'
-)));
-const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codicon.layoutSidebarLeft, ( localize(
-    'toggleAuxiliaryIconLeft',
-    'Icon to toggle the auxiliary bar in its left position.'
-)));
-const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon', Codicon.layoutSidebarLeftOff, ( localize(
-    'toggleAuxiliaryIconLeftOn',
-    'Icon to toggle the auxiliary bar on in its left position.'
-)));
+const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleAuxiliaryIconRight', 'Icon to toggle the auxiliary bar off in its right position.'));
+const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleAuxiliaryIconRightOn', 'Icon to toggle the auxiliary bar on in its right position.'));
+const auxiliaryBarLeftIcon = registerIcon('auxiliarybar-left-layout-icon', Codicon.layoutSidebarLeft, localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleAuxiliaryIconLeft', 'Icon to toggle the auxiliary bar in its left position.'));
+const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon', Codicon.layoutSidebarLeftOff, localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleAuxiliaryIconLeftOn', 'Icon to toggle the auxiliary bar on in its left position.'));
 class ToggleAuxiliaryBarAction extends Action2 {
     static { this.ID = 'workbench.action.toggleAuxiliaryBar'; }
-    static { this.LABEL = ( localize('toggleAuxiliaryBar', "Toggle Secondary Side Bar Visibility")); }
+    static { this.LABEL = localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleAuxiliaryBar', "Toggle Secondary Side Bar Visibility"); }
     constructor() {
         super({
             id: ToggleAuxiliaryBarAction.ID,
             title: { value: ToggleAuxiliaryBarAction.LABEL, original: 'Toggle Secondary Side Bar Visibility' },
             toggled: {
                 condition: AuxiliaryBarVisibleContext,
-                title: ( localize('secondary sidebar', "Secondary Side Bar")),
-                mnemonicTitle: ( localize(
-                    { key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] },
-                    "Secondary Si&&de Bar"
-                )),
+                title: localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'secondary sidebar', "Secondary Side Bar"),
+                mnemonicTitle: localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', { key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "Secondary Si&&de Bar"),
             },
             category: Categories.View,
             f1: true,
@@ -67,7 +52,7 @@ class ToggleAuxiliaryBarAction extends Action2 {
 registerAction2(ToggleAuxiliaryBarAction);
 registerAction2(class FocusAuxiliaryBarAction extends Action2 {
     static { this.ID = 'workbench.action.focusAuxiliaryBar'; }
-    static { this.LABEL = ( localize('focusAuxiliaryBar', "Focus into Secondary Side Bar")); }
+    static { this.LABEL = localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'focusAuxiliaryBar', "Focus into Secondary Side Bar"); }
     constructor() {
         super({
             id: FocusAuxiliaryBarAction.ID,
@@ -93,7 +78,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localize('toggleSecondarySideBar', "Toggle Secondary Side Bar")),
+                title: localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleSecondarySideBar', "Toggle Secondary Side Bar"),
                 toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarLeftIcon },
                 icon: auxiliaryBarLeftOffIcon,
             },
@@ -106,7 +91,7 @@ MenuRegistry.appendMenuItems([
             group: '0_workbench_toggles',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: ( localize('toggleSecondarySideBar', "Toggle Secondary Side Bar")),
+                title: localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'toggleSecondarySideBar', "Toggle Secondary Side Bar"),
                 toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarRightIcon },
                 icon: auxiliaryBarRightOffIcon,
             },
@@ -119,7 +104,7 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: ToggleAuxiliaryBarAction.ID,
-                title: { value: ( localize('hideAuxiliaryBar', "Hide Secondary Side Bar")), original: 'Hide Secondary Side Bar' },
+                title: { value: localizeWithPath('vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions', 'hideAuxiliaryBar', "Hide Secondary Side Bar"), original: 'Hide Secondary Side Bar' },
             },
             when: ( ContextKeyExpr.and(AuxiliaryBarVisibleContext, ( ContextKeyExpr.equals(
                 'viewLocation',

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action, Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
 import { addDisposableListener, EventType, append, $, hide, clearNode, show, EventHelper, getDomNodePagePosition } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
@@ -233,10 +233,10 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
     }
     computeTitle() {
         this.keybindingLabel = this.computeKeybindingLabel();
-        let title = this.keybindingLabel ? ( localize('titleKeybinding', "{0} ({1})", this.activity.name, this.keybindingLabel)) : this.activity.name;
+        let title = this.keybindingLabel ? localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'titleKeybinding', "{0} ({1})", this.activity.name, this.keybindingLabel) : this.activity.name;
         const badge = this.action.getBadge();
         if (badge?.getDescription()) {
-            title = ( localize('badgeTitle', "{0} - {1}", title, badge.getDescription()));
+            title = localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'badgeTitle', "{0} - {1}", title, badge.getDescription());
         }
         return title;
     }
@@ -302,7 +302,7 @@ class CompositeOverflowActivityAction extends ActivityAction {
     constructor(showMenu) {
         super({
             id: 'additionalComposites.action',
-            name: ( localize('additionalViews', "Additional Views")),
+            name: localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'additionalViews', "Additional Views"),
             classNames: ThemeIcon.asClassNameArray(Codicon.more)
         });
         this.showMenu = showMenu;
@@ -346,7 +346,7 @@ let CompositeOverflowActivityActionViewItem = class CompositeOverflowActivityAct
                 suffix = badge.text;
             }
             if (suffix) {
-                action.label = ( localize('numberBadge', "{0} ({1})", composite.name, suffix));
+                action.label = localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'numberBadge', "{0} ({1})", composite.name, suffix);
             }
             else {
                 action.label = composite.name || '';
@@ -370,7 +370,7 @@ CompositeOverflowActivityActionViewItem = ( __decorate([
 ], CompositeOverflowActivityActionViewItem));
 let ManageExtensionAction = class ManageExtensionAction extends Action {
     constructor(commandService) {
-        super('activitybar.manage.extension', ( localize('manageExtension', "Manage Extension")));
+        super('activitybar.manage.extension', localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'manageExtension', "Manage Extension"));
         this.commandService = commandService;
     }
     run(id) {
@@ -481,18 +481,18 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
         }
         const isPinned = this.compositeBar.isPinned(this.activity.id);
         if (isPinned) {
-            this.toggleCompositePinnedAction.label = ( localize('hide', "Hide '{0}'", this.activity.name));
+            this.toggleCompositePinnedAction.label = localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'hide', "Hide '{0}'", this.activity.name);
             this.toggleCompositePinnedAction.checked = false;
         }
         else {
-            this.toggleCompositePinnedAction.label = ( localize('keep', "Keep '{0}'", this.activity.name));
+            this.toggleCompositePinnedAction.label = localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'keep', "Keep '{0}'", this.activity.name);
         }
         const isBadgeEnabled = this.compositeBar.areBadgesEnabled(this.activity.id);
         if (isBadgeEnabled) {
-            this.toggleCompositeBadgeAction.label = ( localize('hideBadge', "Hide Badge"));
+            this.toggleCompositeBadgeAction.label = localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'hideBadge', "Hide Badge");
         }
         else {
-            this.toggleCompositeBadgeAction.label = ( localize('showBadge', "Show Badge"));
+            this.toggleCompositeBadgeAction.label = localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'showBadge', "Show Badge");
         }
         const otherActions = this.contextMenuActionsProvider();
         if (otherActions.length) {
@@ -551,7 +551,7 @@ CompositeActionViewItem = CompositeActionViewItem_1 = ( __decorate([
 ], CompositeActionViewItem));
 class ToggleCompositePinnedAction extends Action {
     constructor(activity, compositeBar) {
-        super('show.toggleCompositePinned', activity ? activity.name : ( localize('toggle', "Toggle View Pinned")));
+        super('show.toggleCompositePinned', activity ? activity.name : localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'toggle', "Toggle View Pinned"));
         this.activity = activity;
         this.compositeBar = compositeBar;
         this.checked = !!this.activity && this.compositeBar.isPinned(this.activity.id);
@@ -568,7 +568,7 @@ class ToggleCompositePinnedAction extends Action {
 }
 class ToggleCompositeBadgeAction extends Action {
     constructor(activity, compositeBar) {
-        super('show.toggleCompositeBadge', activity ? activity.name : ( localize('toggleBadge', "Toggle View Badge")));
+        super('show.toggleCompositeBadge', activity ? activity.name : localizeWithPath('vs/workbench/browser/parts/compositeBarActions', 'toggleBadge', "Toggle View Badge"));
         this.activity = activity;
         this.compositeBar = compositeBar;
         this.checked = false;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { BINARY_DIFF_EDITOR_ID } from '../../../common/editor.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
@@ -20,12 +20,7 @@ let BinaryResourceDiffEditor = class BinaryResourceDiffEditor extends SideBySide
         const primary = this.getPrimaryEditorPane();
         const secondary = this.getSecondaryEditorPane();
         if (primary instanceof BaseBinaryResourceEditor && secondary instanceof BaseBinaryResourceEditor) {
-            return ( localize(
-                'metadataDiff',
-                "{0} ↔ {1}",
-                secondary.getMetadata(),
-                primary.getMetadata()
-            ));
+            return localizeWithPath('vs/workbench/browser/parts/editor/binaryDiffEditor', 'metadataDiff', "{0} ↔ {1}", secondary.getMetadata(), primary.getMetadata());
         }
         return undefined;
     }