@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath } from '../../../../../nls.js';
+import { localize2 } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
@@ -29,11 +29,10 @@ import { isWeb } from '../../../../../base/common/platform.js';
 import { DragAndDropObserver, getWindow } from '../../../../../base/browser/dom.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
 var EmptyView_1;
-const _moduleId = "vs/workbench/contrib/files/browser/views/emptyView";
 let EmptyView = class EmptyView extends ViewPane {
     static { EmptyView_1 = this; }
     static { this.ID = 'workbench.explorer.emptyView'; }
-    static { this.NAME = ( localize2WithPath(_moduleId, 0, "No Folder Opened")); }
+    static { this.NAME = ( localize2(10064, "No Folder Opened")); }
     constructor(options, themeService, viewDescriptorService, instantiationService, keybindingService, contextMenuService, contextService, configurationService, labelService, contextKeyService, openerService, telemetryService, hoverService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.contextService = contextService;

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../../../base/common/event.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
 import '../../../../../platform/theme/common/colorUtils.js';
 import '../../../../../platform/theme/common/colors/baseColors.js';
@@ -17,13 +17,11 @@ import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { explorerRootErrorEmitter } from './explorerViewer.js';
 import { IExplorerService } from '../files.service.js';
 import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
-const _moduleId = "vs/workbench/contrib/files/browser/views/explorerDecorationsProvider";
 function provideDecorations(fileStat) {
     if (fileStat.isRoot && fileStat.error) {
         return {
-            tooltip: ( localizeWithPath(
-                _moduleId,
-                0,
+            tooltip: ( localize(
+                11256,
                 "Unable to resolve workspace folder ({0})",
                 toErrorMessage(fileStat.error)
             )),
@@ -33,13 +31,13 @@ function provideDecorations(fileStat) {
     }
     if (fileStat.isSymbolicLink) {
         return {
-            tooltip: ( localizeWithPath(_moduleId, 1, "Symbolic Link")),
+            tooltip: ( localize(11257, "Symbolic Link")),
             letter: '\u2937'
         };
     }
     if (fileStat.isUnknown) {
         return {
-            tooltip: ( localizeWithPath(_moduleId, 2, "Unknown File Type")),
+            tooltip: ( localize(11258, "Unknown File Type")),
             letter: '?'
         };
     }
@@ -53,7 +51,7 @@ function provideDecorations(fileStat) {
 let ExplorerDecorationsProvider = class ExplorerDecorationsProvider {
     constructor(explorerService, contextService) {
         this.explorerService = explorerService;
-        this.label = ( localizeWithPath(_moduleId, 3, "Explorer"));
+        this.label = ( localize(11259, "Explorer"));
         this._onDidChange = ( (new Emitter()));
         this.toDispose = ( (new DisposableStore()));
         this.toDispose.add(this._onDidChange);

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
+import { localize, localize2 } from '../../../../../nls.js';
 import { mark } from '../../../../../base/common/performance.js';
 import { memoize } from '../../../../../base/common/decorators.js';
 import { ExplorerFolderContext, ExplorerResourceReadonlyContext, ExplorerResourceAvailableEditorIdsContext, ExplorerRootContext, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ViewHasSomeCollapsibleRootItemContext, FoldersViewVisibleContext, ExplorerResourceCut, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerResourceNotReadonlyContext, VIEW_ID } from '../../common/files.js';
@@ -53,7 +53,6 @@ import { isInputElement } from '../../../../../base/browser/ui/list/listWidget.j
 import { AbstractTreePart } from '../../../../../base/browser/ui/tree/abstractTree.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
 var ExplorerView_1;
-const _moduleId = "vs/workbench/contrib/files/browser/views/explorerView";
 function hasExpandedRootChild(tree, treeInput) {
     for (const folder of treeInput) {
         if (tree.hasNode(folder) && !tree.isCollapsed(folder)) {
@@ -186,7 +185,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
         const setHeader = () => {
             titleElement.textContent = this.name;
             this.updateTitle(this.name);
-            this.ariaHeaderLabel = ( localizeWithPath(_moduleId, 0, "Explorer Section: {0}", this.name));
+            this.ariaHeaderLabel = ( localize(10057, "Explorer Section: {0}", this.name));
             titleElement.setAttribute('aria-label', this.ariaHeaderLabel);
         };
         this._register(this.contextService.onDidChangeWorkspaceName(setHeader));
@@ -489,7 +488,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
         const stat = elements && elements.length ? elements[0] : undefined;
         this.setContextKeys(stat);
         if (stat) {
-            const enableTrash = this.configurationService.getValue().files.enableTrash;
+            const enableTrash = Boolean(this.configurationService.getValue().files?.enableTrash);
             const hasCapability = this.fileService.hasCapability(stat.resource, FileSystemProviderCapabilities.Trash);
             this.resourceMoveableToTrash.set(enableTrash && hasCapability);
         }
@@ -776,7 +775,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.createFileFromExplorer',
-            title: ( localizeWithPath(_moduleId, 1, "New File...")),
+            title: ( localize(10058, "New File...")),
             f1: false,
             icon: Codicon.newFile,
             precondition: ExplorerResourceNotReadonlyContext,
@@ -797,7 +796,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.createFolderFromExplorer',
-            title: ( localizeWithPath(_moduleId, 2, "New Folder...")),
+            title: ( localize(10059, "New Folder...")),
             f1: false,
             icon: Codicon.newFolder,
             precondition: ExplorerResourceNotReadonlyContext,
@@ -818,7 +817,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.refreshFilesExplorer',
-            title: ( localize2WithPath(_moduleId, 3, "Refresh Explorer")),
+            title: ( localize2(10060, "Refresh Explorer")),
             f1: true,
             icon: Codicon.refresh,
             menu: {
@@ -828,7 +827,7 @@ registerAction2(class extends Action2 {
                 order: 30
             },
             metadata: {
-                description: ( localize2WithPath(_moduleId, 4, "Forces a refresh of the Explorer."))
+                description: ( localize2(10061, "Forces a refresh of the Explorer."))
             }
         });
     }
@@ -843,7 +842,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.collapseExplorerFolders',
-            title: ( localize2WithPath(_moduleId, 5, "Collapse Folders in Explorer")),
+            title: ( localize2(10062, "Collapse Folders in Explorer")),
             f1: true,
             icon: Codicon.collapseAll,
             menu: {
@@ -853,7 +852,7 @@ registerAction2(class extends Action2 {
                 order: 40
             },
             metadata: {
-                description: ( localize2WithPath(_moduleId, 6, "Folds all folders in the Explorer."))
+                description: ( localize2(10063, "Folds all folders in the Explorer."))
             }
         });
     }

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js

@@ -20,7 +20,7 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { UndoConfirmLevel } from '../../common/files.js';
 import { dirname, joinPath, distinctParents } from '../../../../../base/common/resources.js';
 import { InputBox, MessageType } from '../../../../../base/browser/ui/inputbox/inputBox.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { createSingleCallFunction } from '../../../../../base/common/functional.js';
 import { equals, deepClone } from '../../../../../base/common/objects.js';
 import { relative } from '../../../../../base/common/path.js';
@@ -39,7 +39,7 @@ import { IWorkspaceEditingService } from '../../../../services/workspaces/common
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { findValidPasteFileTarget } from '../fileActions.js';
 import { createMatches } from '../../../../../base/common/filters.js';
-import { Emitter, EventMultiplexer, Event } from '../../../../../base/common/event.js';
+import { EventMultiplexer, Event, Emitter } from '../../../../../base/common/event.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { isNumber } from '../../../../../base/common/types.js';
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.service.js';
@@ -58,7 +58,6 @@ import { mainWindow } from '../../../../../base/browser/window.js';
 import { explorerFileContribRegistry } from '../explorerFileContrib.js';
 import Severity$1 from '../../../../../base/common/severity.js';
 var FilesRenderer_1, FileDragAndDrop_1;
-const _moduleId = "vs/workbench/contrib/files/browser/views/explorerViewer";
 class ExplorerDelegate {
     static { this.ITEM_HEIGHT = 22; }
     getHeight(element) {
@@ -250,7 +249,7 @@ let FilesRenderer = class FilesRenderer {
         updateOffsetStyles();
     }
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Files Explorer"));
+        return ( localize(11260, "Files Explorer"));
     }
     get templateId() {
         return FilesRenderer_1.ID;
@@ -386,11 +385,7 @@ let FilesRenderer = class FilesRenderer {
                     };
                 }
             },
-            ariaLabel: ( localizeWithPath(
-                _moduleId,
-                1,
-                "Type file name. Press Enter to confirm or Escape to cancel."
-            )),
+            ariaLabel: ( localize(11261, "Type file name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         const lastDot = value.lastIndexOf('.');
@@ -1013,27 +1008,23 @@ let FileDragAndDrop = class FileDragAndDrop {
         const isCopy = (originalEvent.ctrlKey && !isMacintosh) || (originalEvent.altKey && isMacintosh);
         const confirmDragAndDrop = !isCopy && this.configurationService.getValue(FileDragAndDrop_1.CONFIRM_DND_SETTING_KEY);
         if (confirmDragAndDrop) {
-            const message = items.length > 1 && items.every(s => s.isRoot) ? ( localizeWithPath(
-                _moduleId,
-                2,
+            const message = items.length > 1 && items.every(s => s.isRoot) ? ( localize(
+                11262,
                 "Are you sure you want to change the order of multiple root folders in your workspace?"
             ))
-                : items.length > 1 ? ( localizeWithPath(
-                _moduleId,
-                3,
+                : items.length > 1 ? ( localize(
+                11263,
                 "Are you sure you want to move the following {0} files into '{1}'?",
                 items.length,
                 target.name
             ))
-                    : items[0].isRoot ? ( localizeWithPath(
-                _moduleId,
-                4,
+                    : items[0].isRoot ? ( localize(
+                11264,
                 "Are you sure you want to change the order of root folder '{0}' in your workspace?",
                 items[0].name
             ))
-                        : ( localizeWithPath(
-                _moduleId,
-                5,
+                        : ( localize(
+                11265,
                 "Are you sure you want to move '{0}' into '{1}'?",
                 items[0].name,
                 target.name
@@ -1043,9 +1034,9 @@ let FileDragAndDrop = class FileDragAndDrop {
                 message,
                 detail,
                 checkbox: {
-                    label: ( localizeWithPath(_moduleId, 6, "Do not ask me again"))
+                    label: ( localize(11266, "Do not ask me again"))
                 },
-                primaryButton: ( localizeWithPath(_moduleId, 7, "&&Move"))
+                primaryButton: ( localize(11267, "&&Move"))
             });
             if (!confirmation.confirmed) {
                 return;
@@ -1125,8 +1116,8 @@ let FileDragAndDrop = class FileDragAndDrop {
         const labelSuffix = getFileOrFolderLabelSuffix(sources);
         await this.explorerService.applyBulkEdit(resourceFileEdits, {
             confirmBeforeUndo: explorerConfig.confirmUndo === UndoConfirmLevel.Default || explorerConfig.confirmUndo === UndoConfirmLevel.Verbose,
-            undoLabel: ( localizeWithPath(_moduleId, 8, "Copy {0}", labelSuffix)),
-            progressLabel: ( localizeWithPath(_moduleId, 9, "Copying {0}", labelSuffix)),
+            undoLabel: ( localize(11268, "Copy {0}", labelSuffix)),
+            progressLabel: ( localize(11269, "Copying {0}", labelSuffix)),
         });
         const editors = ( (resourceFileEdits.filter(edit => {
             const item = edit.newResource ? this.explorerService.findClosest(edit.newResource) : undefined;
@@ -1141,8 +1132,8 @@ let FileDragAndDrop = class FileDragAndDrop {
         const labelSuffix = getFileOrFolderLabelSuffix(sources);
         const options = {
             confirmBeforeUndo: this.configurationService.getValue().explorer.confirmUndo === UndoConfirmLevel.Verbose,
-            undoLabel: ( localizeWithPath(_moduleId, 10, "Move {0}", labelSuffix)),
-            progressLabel: ( localizeWithPath(_moduleId, 11, "Moving {0}", labelSuffix))
+            undoLabel: ( localize(11270, "Move {0}", labelSuffix)),
+            progressLabel: ( localize(11271, "Moving {0}", labelSuffix))
         };
         try {
             await this.explorerService.applyBulkEdit(resourceFileEdits, options);
@@ -1240,10 +1231,10 @@ function getFileOrFolderLabelSuffix(items) {
         return items[0].name;
     }
     if (items.every(i => i.isDirectory)) {
-        return ( localizeWithPath(_moduleId, 12, "{0} folders", items.length));
+        return ( localize(11272, "{0} folders", items.length));
     }
     if (items.every(i => !i.isDirectory)) {
-        return ( localizeWithPath(_moduleId, 13, "{0} files", items.length));
+        return ( localize(11273, "{0} files", items.length));
     }
     return `${items.length} files and folders`;
 }

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './media/openeditors.css.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
+import { localize2, localize } from '../../../../../nls.js';
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { ActionRunner } from '../../../../../base/common/actions.js';
 import { append, isMouseEvent, getLargestChildWidth, $ as $$1 } from '../../../../../base/browser/dom.js';
@@ -35,7 +35,7 @@ import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { DisposableMap, dispose } from '../../../../../base/common/lifecycle.js';
 import { MenuId, registerAction2, MenuRegistry, Action2 } from '../../../../../platform/actions/common/actions.js';
-import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from '../fileConstants.js';
+import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext, OpenEditorsSelectedFileOrUntitledContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from '../fileConstants.js';
 import { ResourceContextKey, MultipleEditorGroupsContext } from '../../../../common/contextkeys.js';
 import { containsDragType, CodeDataTransfers } from '../../../../../platform/dnd/browser/dnd.js';
 import { ResourcesDropHandler, fillEditorsDragData } from '../../../../browser/dnd.js';
@@ -59,21 +59,22 @@ import { extUriIgnorePathCase } from '../../../../../base/common/resources.js';
 import { mainWindow } from '../../../../../base/browser/window.js';
 import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
+import { IFileService } from '../../../../../platform/files/common/files.service.js';
 import { Orientation } from '../../../../../base/browser/ui/sash/sash.js';
 var OpenEditorsView_1;
-const _moduleId = "vs/workbench/contrib/files/browser/views/openEditorsView";
 const $ = $$1;
 let OpenEditorsView = class OpenEditorsView extends ViewPane {
     static { OpenEditorsView_1 = this; }
     static { this.DEFAULT_VISIBLE_OPEN_EDITORS = 9; }
     static { this.DEFAULT_MIN_VISIBLE_OPEN_EDITORS = 0; }
     static { this.ID = 'workbench.explorer.openEditorsView'; }
-    static { this.NAME = ( localize2WithPath(_moduleId, 0, "Open Editors")); }
-    constructor(options, instantiationService, viewDescriptorService, contextMenuService, editorGroupService, configurationService, keybindingService, contextKeyService, themeService, telemetryService, hoverService, workingCopyService, filesConfigurationService, openerService) {
+    static { this.NAME = ( localize2(5403, "Open Editors")); }
+    constructor(options, instantiationService, viewDescriptorService, contextMenuService, editorGroupService, configurationService, keybindingService, contextKeyService, themeService, telemetryService, hoverService, workingCopyService, filesConfigurationService, openerService, fileService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorGroupService = editorGroupService;
         this.workingCopyService = workingCopyService;
         this.filesConfigurationService = filesConfigurationService;
+        this.fileService = fileService;
         this.needsRefresh = false;
         this.elements = [];
         this.blockFocusActiveEditorTracking = false;
@@ -202,30 +203,8 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             }
         }, this.structuralRefreshDelay))));
         this.updateSize();
-        OpenEditorsFocusedContext.bindTo(this.list.contextKeyService);
-        ExplorerFocusedContext.bindTo(this.list.contextKeyService);
-        this.resourceContext = this.instantiationService.createInstance(ResourceContextKey);
-        this._register(this.resourceContext);
-        this.groupFocusedContext = OpenEditorsGroupContext.bindTo(this.contextKeyService);
-        this.dirtyEditorFocusedContext = OpenEditorsDirtyEditorContext.bindTo(this.contextKeyService);
-        this.readonlyEditorFocusedContext = OpenEditorsReadonlyEditorContext.bindTo(this.contextKeyService);
+        this.handleContextKeys();
         this._register(this.list.onContextMenu(e => this.onListContextMenu(e)));
-        this._register(this.list.onDidChangeFocus(e => {
-            this.resourceContext.reset();
-            this.groupFocusedContext.reset();
-            this.dirtyEditorFocusedContext.reset();
-            this.readonlyEditorFocusedContext.reset();
-            const element = e.elements.length ? e.elements[0] : undefined;
-            if (element instanceof OpenEditor) {
-                const resource = element.getResource();
-                this.dirtyEditorFocusedContext.set(element.editor.isDirty() && !element.editor.isSaving());
-                this.readonlyEditorFocusedContext.set(!!element.editor.isReadonly());
-                this.resourceContext.set(resource ?? null);
-            }
-            else if (!!element) {
-                this.groupFocusedContext.set(true);
-            }
-        }));
         this._register(this.list.onMouseMiddleClick(e => {
             if (e && e.element instanceof OpenEditor) {
                 if (preventEditorClose(e.element.group, e.element.editor, EditorCloseMethod.MOUSE, this.editorGroupService.partOptions)) {
@@ -267,6 +246,45 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             this.updateSize();
         }));
     }
+    handleContextKeys() {
+        if (!this.list) {
+            return;
+        }
+        OpenEditorsFocusedContext.bindTo(this.list.contextKeyService);
+        ExplorerFocusedContext.bindTo(this.list.contextKeyService);
+        const groupFocusedContext = OpenEditorsGroupContext.bindTo(this.contextKeyService);
+        const dirtyEditorFocusedContext = OpenEditorsDirtyEditorContext.bindTo(this.contextKeyService);
+        const readonlyEditorFocusedContext = OpenEditorsReadonlyEditorContext.bindTo(this.contextKeyService);
+        const openEditorsSelectedFileOrUntitledContext = OpenEditorsSelectedFileOrUntitledContext.bindTo(this.contextKeyService);
+        const resourceContext = this.instantiationService.createInstance(ResourceContextKey);
+        this._register(resourceContext);
+        this._register(this.list.onDidChangeFocus(e => {
+            resourceContext.reset();
+            groupFocusedContext.reset();
+            dirtyEditorFocusedContext.reset();
+            readonlyEditorFocusedContext.reset();
+            const element = e.elements.length ? e.elements[0] : undefined;
+            if (element instanceof OpenEditor) {
+                const resource = element.getResource();
+                dirtyEditorFocusedContext.set(element.editor.isDirty() && !element.editor.isSaving());
+                readonlyEditorFocusedContext.set(!!element.editor.isReadonly());
+                resourceContext.set(resource ?? null);
+            }
+            else if (!!element) {
+                groupFocusedContext.set(true);
+            }
+        }));
+        this._register(this.list.onDidChangeSelection(e => {
+            const selectedAreFileOrUntitled = e.elements.every(e => {
+                if (e instanceof OpenEditor) {
+                    const resource = e.getResource();
+                    return resource && (resource.scheme === Schemas.untitled || this.fileService.hasProvider(resource));
+                }
+                return false;
+            });
+            openEditorsSelectedFileOrUntitledContext.set(selectedAreFileOrUntitled);
+        }));
+    }
     focus() {
         super.focus();
         this.list?.domFocus();
@@ -410,7 +428,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             this.dirtyCountElement.classList.add('hidden');
         }
         else {
-            this.dirtyCountElement.textContent = ( localizeWithPath(_moduleId, 1, "{0} unsaved", dirty));
+            this.dirtyCountElement.textContent = ( localize(5404, "{0} unsaved", dirty));
             this.dirtyCountElement.classList.remove('hidden');
         }
     }
@@ -465,7 +483,8 @@ OpenEditorsView = OpenEditorsView_1 = ( (__decorate([
     ( (__param(10, IHoverService))),
     ( (__param(11, IWorkingCopyService))),
     ( (__param(12, IFilesConfigurationService))),
-    ( (__param(13, IOpenerService)))
+    ( (__param(13, IOpenerService))),
+    ( (__param(14, IFileService)))
 ], OpenEditorsView)));
 class OpenEditorActionRunner extends ActionRunner {
     async run(action) {
@@ -680,7 +699,7 @@ OpenEditorsDragAndDrop.__decorator = ( (__decorate([
 ], OpenEditorsDragAndDrop.prototype, "dropHandler", null)));
 class OpenEditorsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 0, "Open Editors"));
+        return ( localize(5404, "Open Editors"));
     }
     getAriaLabel(element) {
         if (element instanceof OpenEditor) {
@@ -694,7 +713,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleEditorGroupLayout',
-            title: ( localize2WithPath(_moduleId, 2, "Toggle Vertical/Horizontal Editor Layout")),
+            title: ( localize2(5405, "Toggle Vertical/Horizontal Editor Layout")),
             f1: true,
             keybinding: {
                 primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.Digit0,
@@ -724,8 +743,8 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: toggleEditorGroupLayoutId,
         title: {
-            ...( localize2WithPath(_moduleId, 3, "Flip Layout")),
-            mnemonicTitle: ( localizeWithPath(_moduleId, 4, "Flip &&Layout"))
+            ...( localize2(5406, "Flip Layout")),
+            mnemonicTitle: ( localize(5407, "Flip &&Layout"))
         }
     },
     order: 1
@@ -775,7 +794,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'openEditors.newUntitledFile',
-            title: ( localize2WithPath(_moduleId, 5, "New Untitled Text File")),
+            title: ( localize2(5408, "New Untitled Text File")),
             f1: false,
             icon: Codicon.newFile,
             menu: {

package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.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, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -14,7 +14,6 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { IHostService } from '../../../services/host/browser/host.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/contrib/files/browser/workspaceWatcher";
 let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
     static { this.ID = 'workbench.contrib.workspaceWatcher'; }
     constructor(fileService, configurationService, contextService, notificationService, openerService, uriIdentityService, hostService, telemetryService) {
@@ -58,12 +57,11 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
         let reason = undefined;
         if (msg.indexOf('ENOSPC') >= 0) {
             reason = 'ENOSPC';
-            this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
-                _moduleId,
-                0,
+            this.notificationService.prompt(Severity$1.Warning, ( localize(
+                9781,
                 "Unable to watch for file changes. Please follow the instructions link to resolve this issue."
             )), [{
-                    label: ( localizeWithPath(_moduleId, 1, "Instructions")),
+                    label: ( localize(9782, "Instructions")),
                     run: () => this.openerService.open(( (URI.parse('https://go.microsoft.com/fwlink/?linkid=867693'))))
                 }], {
                 sticky: true,
@@ -72,12 +70,11 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
         }
         else if (msg.indexOf('EUNKNOWN') >= 0) {
             reason = 'EUNKNOWN';
-            this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
-                _moduleId,
-                2,
+            this.notificationService.prompt(Severity$1.Warning, ( localize(
+                9783,
                 "File changes watcher stopped unexpectedly. A reload of the window may enable the watcher again unless the workspace cannot be watched for file changes."
             )), [{
-                    label: ( localizeWithPath(_moduleId, 3, "Reload")),
+                    label: ( localize(9784, "Reload")),
                     run: () => this.hostService.reload()
                 }], {
                 sticky: true,

package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.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 { VIEWLET_ID } from './files.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { NumberBadge } from '../../../services/activity/common/activity.js';
@@ -7,7 +7,6 @@ import { IActivityService } from '../../../services/activity/common/activity.ser
 import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.service.js';
 import { WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
-const _moduleId = "vs/workbench/contrib/files/common/dirtyFilesIndicator";
 let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
     static { this.ID = 'workbench.contrib.dirtyFilesIndicator'; }
     constructor(activityService, workingCopyService, filesConfigurationService) {
@@ -36,7 +35,7 @@ let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
         const dirtyCount = this.lastKnownDirtyCount = this.workingCopyService.dirtyCount;
         if (dirtyCount > 0) {
             this.badgeHandle.value = this.activityService.showViewContainerActivity(VIEWLET_ID, {
-                badge: ( (new NumberBadge(dirtyCount, num => num === 1 ? ( localizeWithPath(_moduleId, 0, "1 unsaved file")) : ( localizeWithPath(_moduleId, 1, "{0} unsaved files", dirtyCount))))),
+                badge: ( (new NumberBadge(dirtyCount, num => num === 1 ? ( localize(9785, "1 unsaved file")) : ( localize(9786, "{0} unsaved files", dirtyCount))))),
             });
         }
         else {