@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -0,0 +1,134 @@
+import { getActiveElement } from '../../../../base/browser/dom.js';
+import { List } from '../../../../base/browser/ui/list/listWidget.js';
+import { URI } from '../../../../base/common/uri.js';
+import { isEditorCommandsContext, isEditorIdentifier } from '../../../common/editor.js';
+import { isEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+function resolveCommandsContext(commandArgs, editorService, editorGroupsService, listService) {
+    const commandContext = getCommandsContext(commandArgs, editorService, editorGroupsService, listService);
+    const preserveFocus = commandContext.length ? commandContext[0].preserveFocus || false : false;
+    const resolvedContext = { groupedEditors: [], preserveFocus };
+    for (const editorContext of commandContext) {
+        const groupAndEditor = getEditorAndGroupFromContext(editorContext, editorGroupsService);
+        if (!groupAndEditor) {
+            continue;
+        }
+        const { group, editor } = groupAndEditor;
+        let groupContext = undefined;
+        for (const targetGroupContext of resolvedContext.groupedEditors) {
+            if (targetGroupContext.group.id === group.id) {
+                groupContext = targetGroupContext;
+                break;
+            }
+        }
+        if (!groupContext) {
+            groupContext = { group, editors: [] };
+            resolvedContext.groupedEditors.push(groupContext);
+        }
+        if (editor) {
+            groupContext.editors.push(editor);
+        }
+    }
+    return resolvedContext;
+}
+function getCommandsContext(commandArgs, editorService, editorGroupsService, listService) {
+    const list = listService.lastFocusedList;
+    let isListAction = list instanceof List && list.getHTMLElement() === getActiveElement();
+    let editorContext = getEditorContextFromCommandArgs(commandArgs, isListAction, editorService, editorGroupsService, listService);
+    if (!editorContext) {
+        const activeGroup = editorGroupsService.activeGroup;
+        const activeEditor = activeGroup.activeEditor;
+        editorContext = { groupId: activeGroup.id, editorIndex: activeEditor ? activeGroup.getIndexOfEditor(activeEditor) : undefined };
+        isListAction = false;
+    }
+    const multiEditorContext = getMultiSelectContext(editorContext, isListAction, editorService, editorGroupsService, listService);
+    return moveCurrentEditorContextToFront(editorContext, multiEditorContext);
+}
+function moveCurrentEditorContextToFront(editorContext, multiEditorContext) {
+    if (multiEditorContext.length <= 1) {
+        return multiEditorContext;
+    }
+    const editorContextIndex = multiEditorContext.findIndex(context => context.groupId === editorContext.groupId &&
+        context.editorIndex === editorContext.editorIndex);
+    if (editorContextIndex !== -1) {
+        multiEditorContext.splice(editorContextIndex, 1);
+        multiEditorContext.unshift(editorContext);
+    }
+    else if (editorContext.editorIndex === undefined) {
+        multiEditorContext.unshift(editorContext);
+    }
+    else {
+        throw ( new Error('Editor context not found in multi editor context'));
+    }
+    return multiEditorContext;
+}
+function getEditorContextFromCommandArgs(commandArgs, isListAction, editorService, editorGroupsService, listService) {
+    const filteredArgs = commandArgs.filter(arg => isEditorCommandsContext(arg) || URI.isUri(arg));
+    for (const arg of filteredArgs) {
+        if (isEditorCommandsContext(arg)) {
+            return arg;
+        }
+    }
+    for (const uri of filteredArgs) {
+        const editorIdentifiers = editorService.findEditors(uri);
+        if (editorIdentifiers.length) {
+            const editorIdentifier = editorIdentifiers[0];
+            const group = editorGroupsService.getGroup(editorIdentifier.groupId);
+            return { groupId: editorIdentifier.groupId, editorIndex: group?.getIndexOfEditor(editorIdentifier.editor) };
+        }
+    }
+    if (isListAction) {
+        const list = listService.lastFocusedList;
+        for (const focusedElement of list.getFocusedElements()) {
+            if (isGroupOrEditor(focusedElement)) {
+                return groupOrEditorToEditorContext(focusedElement, undefined, editorGroupsService);
+            }
+        }
+    }
+    return undefined;
+}
+function getMultiSelectContext(editorContext, isListAction, editorService, editorGroupsService, listService) {
+    if (isListAction) {
+        const list = listService.lastFocusedList;
+        const selection = list.getSelectedElements().filter(isGroupOrEditor);
+        if (selection.length > 1) {
+            return ( selection.map(
+                e => groupOrEditorToEditorContext(e, editorContext.preserveFocus, editorGroupsService)
+            ));
+        }
+        if (selection.length === 0) {
+            return getMultiSelectContext(editorContext, false, editorService, editorGroupsService, listService);
+        }
+    }
+    else {
+        const group = editorGroupsService.getGroup(editorContext.groupId);
+        const editor = editorContext.editorIndex !== undefined ? group?.getEditorByIndex(editorContext.editorIndex) : group?.activeEditor;
+        if (group && editor && group.isSelected(editor)) {
+            return ( group.selectedEditors.map(
+                editor => groupOrEditorToEditorContext({ editor, groupId: group.id }, editorContext.preserveFocus, editorGroupsService)
+            ));
+        }
+    }
+    return [editorContext];
+}
+function groupOrEditorToEditorContext(element, preserveFocus, editorGroupsService) {
+    if (isEditorGroup(element)) {
+        return { groupId: element.id, editorIndex: undefined, preserveFocus };
+    }
+    const group = editorGroupsService.getGroup(element.groupId);
+    return { groupId: element.groupId, editorIndex: group ? group.getIndexOfEditor(element.editor) : -1, preserveFocus };
+}
+function isGroupOrEditor(element) {
+    return isEditorGroup(element) || isEditorIdentifier(element);
+}
+function getEditorAndGroupFromContext(commandContext, editorGroupsService) {
+    const group = editorGroupsService.getGroup(commandContext.groupId);
+    if (!group) {
+        return undefined;
+    }
+    if (commandContext.editorIndex === undefined) {
+        return { group, editor: undefined };
+    }
+    const editor = group.getEditorByIndex(commandContext.editorIndex);
+    return { group, editor };
+}
+export { resolveCommandsContext };

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/editorgroupview.css.js';
 import { isSerializedEditorGroupModel, EditorGroupModel, isGroupEditorCloseEvent, isGroupEditorOpenEvent } from '../../../common/editor/editorGroupModel.js';
 import { DEFAULT_EDITOR_ASSOCIATION, GroupModelChangeKind, SideBySideEditor, EditorResourceAccessor, EditorsOrder, EditorInputCapabilities, EditorCloseContext, CloseDirection, TEXT_DIFF_EDITOR_ID, SaveReason } from '../../../common/editor.js';
-import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
+import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Emitter, Relay } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -28,7 +28,7 @@ import { GroupsOrder } from '../../../services/editor/common/editorGroupsService
 import { EditorPanes } from './editorPanes.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { EditorProgressIndicator } from '../../../services/progress/browser/progressIndicator.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { coalesce, firstOrDefault } from '../../../../base/common/arrays.js';
 import { MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
@@ -67,7 +67,6 @@ import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
 import { FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 var EditorGroupView_1;
-const _moduleId = "vs/workbench/browser/parts/editor/editorGroupView";
 let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
     static createNew(editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService, options) {
         return instantiationService.createInstance(EditorGroupView_1, null, editorPartsView, groupsView, groupsLabel, groupIndex, options);
@@ -180,6 +179,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const groupLockedContext = this.editorPartsView.bind(ActiveEditorGroupLockedContext, this);
         const multipleEditorsSelectedContext = MultipleEditorsSelectedInGroupContext.bindTo(this.scopedContextKeyService);
         const twoEditorsSelectedContext = TwoEditorsSelectedInGroupContext.bindTo(this.scopedContextKeyService);
+        const selectedEditorsHaveFileOrUntitledResourceContext = SelectedEditorsInGroupFileOrUntitledResourceContextKey.bindTo(this.scopedContextKeyService);
         const groupActiveEditorContext = this.editorPartsView.bind(ActiveEditorContext, this);
         const groupActiveEditorIsReadonly = this.editorPartsView.bind(ActiveEditorReadonlyContext, this);
         const groupActiveEditorCanRevert = this.editorPartsView.bind(ActiveEditorCanRevertContext, this);
@@ -264,6 +264,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 case GroupModelChangeKind.EDITORS_SELECTION:
                     multipleEditorsSelectedContext.set(this.model.selectedEditors.length > 1);
                     twoEditorsSelectedContext.set(this.model.selectedEditors.length === 2);
+                    selectedEditorsHaveFileOrUntitledResourceContext.set(this.model.selectedEditors.every(e => e.resource && (this.fileService.hasProvider(e.resource) || e.resource.scheme === Schemas.untitled)));
                     break;
             }
             groupEditorsCountContext.set(this.count);
@@ -299,7 +300,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         toolbarContainer.classList.add('editor-group-container-toolbar');
         this.element.appendChild(toolbarContainer);
         const containerToolbar = this._register(( (new ActionBar(toolbarContainer, {
-            ariaLabel: ( localizeWithPath(_moduleId, 0, "Empty editor group actions")),
+            ariaLabel: ( localize(10019, "Empty editor group actions")),
             highlightToggledItems: true
         }))));
         const containerToolbarMenu = this._register(this.menuService.createMenu(MenuId.EmptyEditorGroup, this.scopedContextKeyService));
@@ -372,7 +373,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (this.isEmpty) {
             this.element.classList.add('empty');
             this.element.tabIndex = 0;
-            this.element.setAttribute('aria-label', ( localizeWithPath(_moduleId, 1, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute('aria-label', ( localize(10020, "{0} (empty)", this.ariaLabel)));
         }
         else {
             this.element.classList.remove('empty');
@@ -404,14 +405,17 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         options.sticky = this.model.isSticky(activeEditor);
         options.preserveFocus = true;
         const internalOptions = {
-            preserveWindowOrder: true
+            preserveWindowOrder: true,
+            skipTitleUpdate: true,
         };
         const activeElement = getActiveElement();
-        return this.doShowEditor(activeEditor, { active: true, isNew: false  }, options, internalOptions).then(() => {
+        const result = this.doShowEditor(activeEditor, { active: true, isNew: false  }, options, internalOptions).then(() => {
             if (this.groupsView.activeGroup === this && activeElement && isActiveElement(activeElement) && !groupViewOptions?.preserveFocus) {
                 this.focus();
             }
         });
+        this.titleControl.openEditors(this.editors);
+        return result;
     }
     registerListeners() {
         this._register(this.model.onDidModelChange(e => this.onDidGroupModelChange(e)));
@@ -560,7 +564,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             (event.oldPartOptions.showTabs === 'multiple' && event.oldPartOptions.pinnedTabsOnSeparateRow !== event.newPartOptions.pinnedTabsOnSeparateRow)) {
             this.relayout();
             if (this.model.activeEditor) {
-                this.titleControl.openEditor(this.model.activeEditor);
+                this.titleControl.openEditors(this.model.getEditors(EditorsOrder.SEQUENTIAL));
             }
         }
         this.updateStyles();
@@ -599,15 +603,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     get label() {
         if (this.groupsLabel) {
-            return ( localizeWithPath(_moduleId, 2, "{0}: Group {1}", this.groupsLabel, this._index + 1));
+            return ( localize(10021, "{0}: Group {1}", this.groupsLabel, this._index + 1));
         }
-        return ( localizeWithPath(_moduleId, 3, "Group {0}", this._index + 1));
+        return ( localize(10022, "Group {0}", this._index + 1));
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return ( localizeWithPath(_moduleId, 4, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1));
+            return ( localize(10023, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1));
         }
-        return ( localizeWithPath(_moduleId, 5, "Editor Group {0}", this._index + 1));
+        return ( localize(10024, "Editor Group {0}", this._index + 1));
     }
     get disposed() {
         return this._disposed;
@@ -950,11 +954,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (!keepCopy || editor.hasCapability(EditorInputCapabilities.Singleton) ) {
             const canMoveVeto = editor.canMove(this.id, target.id);
             if (typeof canMoveVeto === 'string') {
-                this.dialogService.error(canMoveVeto, ( localizeWithPath(
-                    _moduleId,
-                    6,
-                    "Try saving or reverting the editor first and then try again."
-                )));
+                this.dialogService.error(canMoveVeto, ( localize(10025, "Try saving or reverting the editor first and then try again.")));
                 return false;
             }
         }

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.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 { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isMacintosh, isWeb, OS } from '../../../../base/common/platform.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
@@ -23,20 +23,19 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-const _moduleId = "vs/workbench/browser/parts/editor/editorGroupWatermark";
-registerColor('editorWatermark.foreground', { dark: ( (transparent(editorForeground, 0.6))), light: ( (transparent(editorForeground, 0.68))), hcDark: editorForeground, hcLight: editorForeground }, ( localizeWithPath(_moduleId, 0, 'Foreground color for the labels in the editor watermark.')));
-const showCommands = { text: ( localizeWithPath(_moduleId, 1, "Show All Commands")), id: 'workbench.action.showCommands' };
-const quickAccess = { text: ( localizeWithPath(_moduleId, 2, "Go to File")), id: 'workbench.action.quickOpen' };
-const openFileNonMacOnly = { text: ( localizeWithPath(_moduleId, 3, "Open File")), id: 'workbench.action.files.openFile', mac: false };
-const openFolderNonMacOnly = { text: ( localizeWithPath(_moduleId, 4, "Open Folder")), id: 'workbench.action.files.openFolder', mac: false };
-const openFileOrFolderMacOnly = { text: ( localizeWithPath(_moduleId, 5, "Open File or Folder")), id: 'workbench.action.files.openFileFolder', mac: true };
-const openRecent = { text: ( localizeWithPath(_moduleId, 6, "Open Recent")), id: 'workbench.action.openRecent' };
-const newUntitledFileMacOnly = { text: ( localizeWithPath(_moduleId, 7, "New Untitled Text File")), id: 'workbench.action.files.newUntitledFile', mac: true };
-const findInFiles = { text: ( localizeWithPath(_moduleId, 8, "Find in Files")), id: 'workbench.action.findInFiles' };
-const toggleTerminal = { text: ( localizeWithPath(_moduleId, 9, "Toggle Terminal")), id: 'workbench.action.terminal.toggleTerminal', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
-const startDebugging = { text: ( localizeWithPath(_moduleId, 10, "Start Debugging")), id: 'workbench.action.debug.start', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
-const toggleFullscreen = { text: ( localizeWithPath(_moduleId, 11, "Toggle Full Screen")), id: 'workbench.action.toggleFullScreen' };
-const showSettings = { text: ( localizeWithPath(_moduleId, 12, "Show Settings")), id: 'workbench.action.openSettings' };
+registerColor('editorWatermark.foreground', { dark: ( (transparent(editorForeground, 0.6))), light: ( (transparent(editorForeground, 0.68))), hcDark: editorForeground, hcLight: editorForeground }, ( localize(11243, 'Foreground color for the labels in the editor watermark.')));
+const showCommands = { text: ( localize(11244, "Show All Commands")), id: 'workbench.action.showCommands' };
+const quickAccess = { text: ( localize(11245, "Go to File")), id: 'workbench.action.quickOpen' };
+const openFileNonMacOnly = { text: ( localize(11246, "Open File")), id: 'workbench.action.files.openFile', mac: false };
+const openFolderNonMacOnly = { text: ( localize(11247, "Open Folder")), id: 'workbench.action.files.openFolder', mac: false };
+const openFileOrFolderMacOnly = { text: ( localize(11248, "Open File or Folder")), id: 'workbench.action.files.openFileFolder', mac: true };
+const openRecent = { text: ( localize(11249, "Open Recent")), id: 'workbench.action.openRecent' };
+const newUntitledFileMacOnly = { text: ( localize(11250, "New Untitled Text File")), id: 'workbench.action.files.newUntitledFile', mac: true };
+const findInFiles = { text: ( localize(11251, "Find in Files")), id: 'workbench.action.findInFiles' };
+const toggleTerminal = { text: ( localize(11252, "Toggle Terminal")), id: 'workbench.action.terminal.toggleTerminal', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
+const startDebugging = { text: ( localize(11253, "Start Debugging")), id: 'workbench.action.debug.start', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
+const toggleFullscreen = { text: ( localize(11254, "Toggle Full Screen")), id: 'workbench.action.toggleFullScreen' };
+const showSettings = { text: ( localize(11255, "Show Settings")), id: 'workbench.action.openSettings' };
 const noFolderEntries = [
     showCommands,
     openFileNonMacOnly,

package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.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 { Emitter } from '../../../../base/common/event.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -20,7 +20,6 @@ import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
-const _moduleId = "vs/workbench/browser/parts/editor/editorPanes";
 let EditorPanes = class EditorPanes extends Disposable {
     get minimumWidth() { return this._activeEditorPane?.minimumWidth ?? DEFAULT_EDITOR_MIN_DIMENSIONS.width; }
     get minimumHeight() { return this._activeEditorPane?.minimumHeight ?? DEFAULT_EDITOR_MIN_DIMENSIONS.height; }
@@ -103,7 +102,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         }
         if (!message) {
-            message = ( localizeWithPath(_moduleId, 0, "Unable to open '{0}'", editor.getName()));
+            message = ( localize(11241, "Unable to open '{0}'", editor.getName()));
         }
         const buttons = [];
         if (errorActions && errorActions.length > 0) {
@@ -116,7 +115,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         }
         else {
             buttons.push({
-                label: ( localizeWithPath(_moduleId, 1, "&&OK")),
+                label: ( localize(11242, "&&OK")),
                 run: () => undefined
             });
         }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editorplaceholder.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { truncate, truncateMiddle } from '../../../../base/common/strings.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { isEditorOpenError } from '../../../common/editor.js';
@@ -26,7 +26,6 @@ import { IFileService } from '../../../../platform/files/common/files.service.js
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 var EditorPlaceholder_1, WorkspaceTrustRequiredPlaceholderEditor_1, ErrorPlaceholderEditor_1;
-const _moduleId = "vs/workbench/browser/parts/editor/editorPlaceholder";
 let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
     static { EditorPlaceholder_1 = this; }
     static { this.PLACEHOLDER_LABEL_MAX_LENGTH = 1024; }
@@ -116,8 +115,8 @@ EditorPlaceholder = EditorPlaceholder_1 = ( (__decorate([
 let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceholderEditor extends EditorPlaceholder {
     static { WorkspaceTrustRequiredPlaceholderEditor_1 = this; }
     static { this.ID = 'workbench.editors.workspaceTrustRequiredEditor'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 0, "Workspace Trust Required")); }
-    static { this.DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor_1, WorkspaceTrustRequiredPlaceholderEditor_1.ID, WorkspaceTrustRequiredPlaceholderEditor_1.LABEL); }
+    static { this.LABEL = ( localize(11474, "Workspace Trust Required")); }
+    static { this.DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor_1, this.ID, this.LABEL); }
     constructor(group, telemetryService, themeService, commandService, workspaceService, storageService) {
         super(WorkspaceTrustRequiredPlaceholderEditor_1.ID, group, telemetryService, themeService, storageService);
         this.commandService = commandService;
@@ -130,19 +129,17 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         return {
             icon: '$(workspace-untrusted)',
             label: isSingleFolderWorkspaceIdentifier(toWorkspaceIdentifier(this.workspaceService.getWorkspace())) ?
-                ( localizeWithPath(
-                    _moduleId,
-                    1,
+                ( localize(
+                    11475,
                     "The file is not displayed in the editor because trust has not been granted to the folder."
                 )) :
-                ( localizeWithPath(
-                    _moduleId,
-                    2,
+                ( localize(
+                    11476,
                     "The file is not displayed in the editor because trust has not been granted to the workspace."
                 )),
             actions: [
                 {
-                    label: ( localizeWithPath(_moduleId, 3, "Manage Workspace Trust")),
+                    label: ( localize(11477, "Manage Workspace Trust")),
                     run: () => this.commandService.executeCommand('workbench.trust.manage')
                 }
             ]
@@ -159,8 +156,8 @@ WorkspaceTrustRequiredPlaceholderEditor = WorkspaceTrustRequiredPlaceholderEdito
 let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlaceholder {
     static { ErrorPlaceholderEditor_1 = this; }
     static { this.ID = 'workbench.editors.errorEditor'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 4, "Error Editor")); }
-    static { this.DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor_1, ErrorPlaceholderEditor_1.ID, ErrorPlaceholderEditor_1.LABEL); }
+    static { this.LABEL = ( localize(11478, "Error Editor")); }
+    static { this.DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor_1, this.ID, this.LABEL); }
     constructor(group, telemetryService, themeService, storageService, fileService, dialogService) {
         super(ErrorPlaceholderEditor_1.ID, group, telemetryService, themeService, storageService);
         this.fileService = fileService;
@@ -172,25 +169,20 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         const isFileNotFound = error?.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         let label;
         if (isFileNotFound) {
-            label = ( localizeWithPath(
-                _moduleId,
-                5,
-                "The editor could not be opened because the file was not found."
-            ));
+            label = ( localize(11479, "The editor could not be opened because the file was not found."));
         }
         else if (isEditorOpenError(error) && error.forceMessage) {
             label = error.message;
         }
         else if (error) {
-            label = ( localizeWithPath(
-                _moduleId,
-                6,
+            label = ( localize(
+                11480,
                 "The editor could not be opened due to an unexpected error: {0}",
                 truncateMiddle(toErrorMessage(error), EditorPlaceholder.PLACEHOLDER_LABEL_MAX_LENGTH / 2)
             ));
         }
         else {
-            label = ( localizeWithPath(_moduleId, 7, "The editor could not be opened due to an unexpected error."));
+            label = ( localize(11481, "The editor could not be opened due to an unexpected error."));
         }
         let icon = '$(error)';
         if (isEditorOpenError(error)) {
@@ -218,7 +210,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         else {
             actions = [
                 {
-                    label: ( localizeWithPath(_moduleId, 8, "Try Again")),
+                    label: ( localize(11482, "Try Again")),
                     run: () => this.group.openEditor(input, { ...options, source: EditorOpenSource.USER  })
                 }
             ];

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editorquickaccess.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { quickPickItemScorerAccessor } from '../../../../platform/quickinput/common/quickInput.js';
 import { PickerQuickAccessProvider, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
 import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
@@ -14,13 +14,12 @@ import { prepareQuery, scoreItemFuzzy, compareItemsByFuzzyScore } from '../../..
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 var ActiveGroupEditorsByMostRecentlyUsedQuickAccess_1, AllEditorsByAppearanceQuickAccess_1, AllEditorsByMostRecentlyUsedQuickAccess_1;
-const _moduleId = "vs/workbench/browser/parts/editor/editorQuickAccess";
 let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends PickerQuickAccessProvider {
     constructor(prefix, editorGroupService, editorService, modelService, languageService) {
         super(prefix, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localizeWithPath(_moduleId, 0, "No matching editors")),
+                label: ( localize(9718, "No matching editors")),
                 groupId: -1
             }
         });
@@ -110,22 +109,20 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                     ariaLabel: (() => {
                         if (mapGroupIdToGroupAriaLabel.size > 1) {
                             return isDirty ?
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    1,
+                                ( localize(
+                                    9719,
                                     "{0}, unsaved changes, {1}",
                                     nameAndDescription,
                                     mapGroupIdToGroupAriaLabel.get(groupId)
                                 )) :
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    2,
+                                ( localize(
+                                    9720,
                                     "{0}, {1}",
                                     nameAndDescription,
                                     mapGroupIdToGroupAriaLabel.get(groupId)
                                 ));
                         }
-                        return isDirty ? ( localizeWithPath(_moduleId, 3, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
+                        return isDirty ? ( localize(9721, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
                     })(),
                     description,
                     iconClasses: getIconClasses(this.modelService, this.languageService, resource, undefined, editor.getIcon()).concat(editor.getLabelExtraClasses()),
@@ -134,7 +131,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                         return [
                             {
                                 iconClass: isDirty ? ('dirty-editor ' + ThemeIcon.asClassName(Codicon.closeDirty)) : ThemeIcon.asClassName(Codicon.close),
-                                tooltip: ( localizeWithPath(_moduleId, 4, "Close Editor")),
+                                tooltip: ( localize(9722, "Close Editor")),
                                 alwaysVisible: isDirty
                             }
                         ];