@codingame/monaco-vscode-views-service-override 1.83.2 → 1.83.3

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

@@ -23,7 +23,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
 import './media/views.css.js';
 import { VSDataTransfer } from 'monaco-editor/esm/vs/base/common/dataTransfer.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { createActionViewItem, createAndFillInContextMenuActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuRegistry, MenuId, registerAction2, Action2, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { CommandsRegistry, ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
@@ -158,10 +158,7 @@ function isTreeCommandEnabled(treeCommand, contextKeyService) {
 function isRenderedMessageValue(messageValue) {
     return !!messageValue && typeof messageValue !== 'string' && 'element' in messageValue && 'dispose' in messageValue;
 }
-const noDataProviderMessage = ( localize(
-    'no-dataprovider',
-    "There is no data provider registered that can provide view data."
-));
+const noDataProviderMessage = localizeWithPath('vs/workbench/browser/parts/views/treeView', 'no-dataprovider', "There is no data provider registered that can provide view data.");
 const RawCustomTreeViewContextKey = ( new RawContextKey('customTreeView', false));
 class Tree extends WorkbenchAsyncDataTree {
 }
@@ -390,11 +387,11 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeShowCollapseAllAction(startingValue = false) {
         if (!this.collapseAllContext) {
-            this.collapseAllContextKey = ( new RawContextKey(`treeView.${this.id}.enableCollapseAll`, startingValue, ( localize(
-                'treeView.enableCollapseAll',
-                "Whether the the tree view with id {0} enables collapse all.",
-                this.id
-            ))));
+            this.collapseAllContextKey = ( new RawContextKey(
+                `treeView.${this.id}.enableCollapseAll`,
+                startingValue,
+                localizeWithPath('vs/workbench/browser/parts/views/treeView', 'treeView.enableCollapseAll', "Whether the the tree view with id {0} enables collapse all.", this.id)
+            ));
             this.collapseAllContext = this.collapseAllContextKey.bindTo(this.contextKeyService);
         }
         return true;
@@ -409,11 +406,11 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeShowRefreshAction(startingValue = false) {
         if (!this.refreshContext) {
-            this.refreshContextKey = ( new RawContextKey(`treeView.${this.id}.enableRefresh`, startingValue, ( localize(
-                'treeView.enableRefresh',
-                "Whether the tree view with id {0} enables refresh.",
-                this.id
-            ))));
+            this.refreshContextKey = ( new RawContextKey(
+                `treeView.${this.id}.enableRefresh`,
+                startingValue,
+                localizeWithPath('vs/workbench/browser/parts/views/treeView', 'treeView.enableRefresh', "Whether the tree view with id {0} enables refresh.", this.id)
+            ));
             this.refreshContext = this.refreshContextKey.bindTo(this.contextKeyService);
         }
     }
@@ -431,7 +428,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.treeView.${that.id}.refresh`,
-                    title: ( localize('refresh', "Refresh")),
+                    title: localizeWithPath('vs/workbench/browser/parts/views/treeView', 'refresh', "Refresh"),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', that.id)), that.refreshContextKey)),
@@ -449,7 +446,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.treeView.${that.id}.collapseAll`,
-                    title: ( localize('collapseAll', "Collapse All")),
+                    title: localizeWithPath('vs/workbench/browser/parts/views/treeView', 'collapseAll', "Collapse All"),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', that.id)), that.collapseAllContextKey)),
@@ -844,11 +841,11 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeCollapseAllToggle() {
         if (!this.collapseAllToggleContext) {
-            this.collapseAllToggleContextKey = ( new RawContextKey(`treeView.${this.id}.toggleCollapseAll`, false, ( localize(
-                'treeView.toggleCollapseAll',
-                "Whether collapse all is toggled for the tree view with id {0}.",
-                this.id
-            ))));
+            this.collapseAllToggleContextKey = ( new RawContextKey(
+                `treeView.${this.id}.toggleCollapseAll`,
+                false,
+                localizeWithPath('vs/workbench/browser/parts/views/treeView', 'treeView.toggleCollapseAll', "Whether collapse all is toggled for the tree view with id {0}.", this.id)
+            ));
             this.collapseAllToggleContext = this.collapseAllToggleContextKey.bindTo(this.contextKeyService);
         }
     }
@@ -1299,12 +1296,7 @@ class MultipleSelectionActionRunner extends ActionRunner {
         this.getSelectedResources = getSelectedResources;
         this._register(this.onDidRun(e => {
             if (e.error && !isCancellationError(e.error)) {
-                notificationService.error(( localize(
-                    'command-error',
-                    'Error running command {1}: {0}. This is likely caused by the extension that contributes {1}.',
-                    e.error.message,
-                    e.action.id
-                )));
+                notificationService.error(localizeWithPath('vs/workbench/browser/parts/views/treeView', 'command-error', 'Error running command {1}: {0}. This is likely caused by the extension that contributes {1}.', e.error.message, e.action.id));
             }
         }));
     }

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.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 { CallHierarchyProviderRegistry, CallHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
@@ -19,18 +19,20 @@ import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconReg
 import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(
+const _ctxHasCallHierarchyProvider = ( new RawContextKey(
     'editorHasCallHierarchyProvider',
-    'Whether a call hierarchy provider is available'
-))));
-const _ctxCallHierarchyVisible = ( new RawContextKey('callHierarchyVisible', false, ( localize('callHierarchyVisible', 'Whether call hierarchy peek is currently showing'))));
+    false,
+    localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'editorHasCallHierarchyProvider', 'Whether a call hierarchy provider is available')
+));
+const _ctxCallHierarchyVisible = ( new RawContextKey(
+    'callHierarchyVisible',
+    false,
+    localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'callHierarchyVisible', 'Whether call hierarchy peek is currently showing')
+));
 const _ctxCallHierarchyDirection = ( new RawContextKey(
     'callHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(
-        'callHierarchyDirection',
-        'Whether call hierarchy shows incoming or outgoing calls'
-    )) }
+    { type: 'string', description: localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'callHierarchyDirection', 'Whether call hierarchy shows incoming or outgoing calls') }
 ));
 function sanitizedDirection(candidate) {
     return candidate === "outgoingCalls"  || candidate === "incomingCalls"
@@ -118,14 +120,14 @@ let CallHierarchyController = class CallHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize('no.item', "No results")));
+                this._widget.showMessage(localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'no.item', "No results"));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize('error', "Failed to show call hierarchy")));
+            this._widget.showMessage(localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'error', "Failed to show call hierarchy"));
         });
     }
     showOutgoingCalls() {
@@ -153,7 +155,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: { value: ( localize('title', "Peek Call Hierarchy")), original: 'Peek Call Hierarchy' },
+            title: { value: localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'title', "Peek Call Hierarchy"), original: 'Peek Call Hierarchy' },
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -177,11 +179,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: { value: ( localize('title.incoming', "Show Incoming Calls")), original: 'Show Incoming Calls' },
-            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(
-                'showIncomingCallsIcons',
-                'Icon for incoming calls in the call hierarchy view.'
-            ))),
+            title: { value: localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'title.incoming', "Show Incoming Calls"), original: 'Show Incoming Calls' },
+            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'showIncomingCallsIcons', 'Icon for incoming calls in the call hierarchy view.')),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo("outgoingCalls" )))),
             keybinding: {
                 weight: 200 ,
@@ -202,11 +201,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: { value: ( localize('title.outgoing', "Show Outgoing Calls")), original: 'Show Outgoing Calls' },
-            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(
-                'showOutgoingCallsIcon',
-                'Icon for outgoing calls in the call hierarchy view.'
-            ))),
+            title: { value: localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'title.outgoing', "Show Outgoing Calls"), original: 'Show Outgoing Calls' },
+            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'showOutgoingCallsIcon', 'Icon for outgoing calls in the call hierarchy view.')),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo("incomingCalls" )))),
             keybinding: {
                 weight: 200 ,
@@ -227,7 +223,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: { value: ( localize('title.refocus', "Refocus Call Hierarchy")), original: 'Refocus Call Hierarchy' },
+            title: { value: localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'title.refocus', "Refocus Call Hierarchy"), original: 'Refocus Call Hierarchy' },
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: 200 ,
@@ -243,7 +239,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeCallHierarchy',
-            title: ( localize('close', 'Close')),
+            title: localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution', 'close', 'Close'),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js

@@ -4,7 +4,7 @@ import * as peekView from 'monaco-editor/esm/vs/editor/contrib/peekView/browser/
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { WorkbenchAsyncDataTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { VirtualDelegate, CallRenderer, DataSource, Sorter, AccessibilityProvider, IdentityProvider } from './callHierarchyTree.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { SplitView, Sizing } from 'monaco-editor/esm/vs/base/browser/ui/splitview/splitview.js';
 import { Dimension } from 'monaco-editor/esm/vs/base/browser/dom.js';
@@ -255,13 +255,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === "outgoingCalls"
-            ? ( localize('callFrom', "Calls from '{0}'", element.model.root.name))
-            : ( localize('callsTo', "Callers of '{0}'", element.model.root.name));
+            ? localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek', 'callFrom', "Calls from '{0}'", element.model.root.name)
+            : localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek', 'callsTo', "Callers of '{0}'", element.model.root.name);
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = "loading" ;
-        this.setTitle(( localize('title.loading', "Loading...")));
+        this.setTitle(localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek', 'title.loading', "Loading..."));
         this._show();
     }
     showMessage(message) {
@@ -280,8 +280,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === "outgoingCalls"
-                ? ( localize('empt.callsFrom', "No calls from '{0}'", model.root.name))
-                : ( localize('empt.callsTo', "No callers of '{0}'", model.root.name)));
+                ? localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek', 'empt.callsFrom', "No calls from '{0}'", model.root.name)
+                : localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek', 'empt.callsTo', "No callers of '{0}'", model.root.name));
         }
         else {
             this._parent.dataset['state'] = "data" ;

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js

@@ -5,7 +5,7 @@ import { IconLabel } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLa
 import { SymbolKinds } from 'monaco-editor/esm/vs/editor/common/languages.js';
 import { compare } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 
 class Call {
@@ -106,14 +106,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize('tree.aria', "Call Hierarchy"));
+        return localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyTree', 'tree.aria', "Call Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === "outgoingCalls" ) {
-            return ( localize('from', "calls from {0}", element.item.name));
+            return localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyTree', 'from', "calls from {0}", element.item.name);
         }
         else {
-            return ( localize('to', "callers of {0}", element.item.name));
+            return localizeWithPath('vs/workbench/contrib/callHierarchy/browser/callHierarchyTree', 'to', "callers of {0}", element.item.name);
         }
     }
 }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -15,11 +15,11 @@ import { defaultInputBoxStyles, defaultToggleStyles } from 'monaco-editor/esm/vs
 import { Sash } from 'monaco-editor/esm/vs/base/browser/ui/sash/sash.js';
 import { registerColor } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 
-const NLS_FIND_INPUT_LABEL = ( nls.localize('label.find', "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( nls.localize('placeholder.find', "Find (\u21C5 for history)"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( nls.localize('label.previousMatchButton', "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( nls.localize('label.nextMatchButton', "Next Match"));
-const NLS_CLOSE_BTN_LABEL = ( nls.localize('label.closeButton', "Close"));
+const NLS_FIND_INPUT_LABEL = nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'label.find', "Find");
+const NLS_FIND_INPUT_PLACEHOLDER = nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'placeholder.find', "Find (\u21C5 for history)");
+const NLS_PREVIOUS_MATCH_BTN_LABEL = nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'label.previousMatchButton', "Previous Match");
+const NLS_NEXT_MATCH_BTN_LABEL = nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'label.nextMatchButton', "Next Match");
+const NLS_CLOSE_BTN_LABEL = nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'label.closeButton', "Close");
 const SIMPLE_FIND_WIDGET_INITIAL_WIDTH = 310;
 const MATCHES_COUNT_WIDTH = 73;
 class SimpleFindWidget extends Widget {
@@ -323,22 +323,17 @@ class SimpleFindWidget extends Widget {
     }
     _announceSearchResults(label, searchString) {
         if (!searchString) {
-            return ( nls.localize('ariaSearchNoInput', "Enter search input"));
+            return nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'ariaSearchNoInput', "Enter search input");
         }
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( nls.localize('ariaSearchNoResultEmpty', "{0} found", label))
-                : ( nls.localize('ariaSearchNoResult', "{0} found for '{1}'", label, searchString));
+                ? nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'ariaSearchNoResultEmpty', "{0} found", label)
+                : nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'ariaSearchNoResult', "{0} found for '{1}'", label, searchString);
         }
-        return ( nls.localize(
-            'ariaSearchNoResultWithLineNumNoCurrentMatch',
-            "{0} found for '{1}'",
-            label,
-            searchString
-        ));
+        return nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'ariaSearchNoResultWithLineNumNoCurrentMatch', "{0} found for '{1}'", label, searchString);
     }
 }
-const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, ( nls.localize('simpleFindWidget.sashBorder', 'Border color of the sash border.')));
+const simpleFindWidgetSashBorder = registerColor('simpleFindWidget.sashBorder', { dark: '#454545', light: '#C8C8C8', hcDark: '#6FC3DF', hcLight: '#0F4A85' }, nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget', 'simpleFindWidget.sashBorder', 'Border color of the sash border.'));
 registerThemingParticipant((theme, collector) => {
     const resizeBorderBackground = theme.getColor(simpleFindWidgetSashBorder);
     collector.addRule(`.monaco-workbench .simple-find-part .monaco-sash { background-color: ${resizeBorderBackground}; border-color: ${resizeBorderBackground} }`);

package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.js

@@ -15,7 +15,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IMarkerDecorationsService } from 'monaco-editor/esm/vs/editor/common/services/markerDecorations.js';
 import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
 import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
@@ -127,7 +127,9 @@ let DocumentSymbolsOutline = class DocumentSymbolsOutline {
             multipleSelectionSupport: false,
             identityProvider: ( new DocumentSymbolIdentityProvider()),
             keyboardNavigationLabelProvider: ( new DocumentSymbolNavigationLabelProvider()),
-            accessibilityProvider: ( new DocumentSymbolAccessibilityProvider(( localize('document', "Document Symbols")))),
+            accessibilityProvider: ( new DocumentSymbolAccessibilityProvider(
+                localizeWithPath('vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline', 'document', "Document Symbols")
+            )),
             filter: target === 1
                 ? instantiationService.createInstance(DocumentSymbolFilter, 'outline')
                 : target === 2

package/vscode/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.js

@@ -6,7 +6,7 @@ import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { symbolKindNames, SymbolKinds, getAriaLabelForSymbol } from 'monaco-editor/esm/vs/editor/common/languages.js';
 import { OutlineModel, OutlineElement, OutlineGroup } from 'monaco-editor/esm/vs/editor/contrib/documentSymbols/browser/outlineModel.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IconLabel } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabel.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
@@ -113,12 +113,7 @@ let DocumentSymbolRenderer = class DocumentSymbolRenderer {
             matches: createMatches(node.filterData),
             labelEscapeNewLines: true,
             extraClasses,
-            title: ( localize(
-                'title.template',
-                "{0} ({1})",
-                element.symbol.name,
-                symbolKindNames[element.symbol.kind]
-            ))
+            title: localizeWithPath('vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree', 'title.template', "{0} ({1})", element.symbol.name, symbolKindNames[element.symbol.kind])
         };
         if (this._configurationService.getValue("outline.icons" )) {
             template.iconClass.className = '';
@@ -155,14 +150,14 @@ let DocumentSymbolRenderer = class DocumentSymbolRenderer {
             dom.show(template.decoration);
             template.decoration.classList.remove('bubble');
             template.decoration.innerText = count < 10 ? ( count.toString()) : '+9';
-            template.decoration.title = count === 1 ? ( localize('1.problem', "1 problem in this element")) : ( localize('N.problem', "{0} problems in this element", count));
+            template.decoration.title = count === 1 ? localizeWithPath('vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree', '1.problem', "1 problem in this element") : localizeWithPath('vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree', 'N.problem', "{0} problems in this element", count);
             template.decoration.style.setProperty('--outline-element-color', cssColor);
         }
         else {
             dom.show(template.decoration);
             template.decoration.classList.add('bubble');
             template.decoration.innerText = '\uea71';
-            template.decoration.title = ( localize('deep.problem', "Contains elements with problems"));
+            template.decoration.title = localizeWithPath('vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree', 'deep.problem', "Contains elements with problems");
             template.decoration.style.setProperty('--outline-element-color', cssColor);
         }
     }

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -30,7 +30,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( nls.localize('builtinProviderDisplayName', "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? nls.localizeWithPath('vs/workbench/contrib/customEditor/common/contributedCustomEditors', 'builtinProviderDisplayName', "Built-in") : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
                     priority: getPriorityFromContribution(webviewEditorContribution, extension.description),
                 })));

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -9,7 +9,7 @@ const Fields = ( Object.freeze({
     priority: 'priority',
 }));
 const CustomEditorsContribution = {
-    description: ( nls.localize('contributes.customEditors', 'Contributed custom editors.')),
+    description: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.customEditors', 'Contributed custom editors.'),
     type: 'array',
     defaultSnippets: [{
             body: [{
@@ -30,24 +30,15 @@ const CustomEditorsContribution = {
         properties: {
             [Fields.viewType]: {
                 type: 'string',
-                markdownDescription: ( nls.localize(
-                    'contributes.viewType',
-                    'Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events).'
-                )),
+                markdownDescription: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.viewType', 'Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events).'),
             },
             [Fields.displayName]: {
                 type: 'string',
-                description: ( nls.localize(
-                    'contributes.displayName',
-                    'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
-                )),
+                description: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.displayName', 'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'),
             },
             [Fields.selector]: {
                 type: 'array',
-                description: ( nls.localize(
-                    'contributes.selector',
-                    'Set of globs that the custom editor is enabled for.'
-                )),
+                description: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.selector', 'Set of globs that the custom editor is enabled for.'),
                 items: {
                     type: 'object',
                     defaultSnippets: [{
@@ -58,33 +49,21 @@ const CustomEditorsContribution = {
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( nls.localize(
-                                'contributes.selector.filenamePattern',
-                                'Glob that the custom editor is enabled for.'
-                            )),
+                            description: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.selector.filenamePattern', 'Glob that the custom editor is enabled for.'),
                         },
                     }
                 }
             },
             [Fields.priority]: {
                 type: 'string',
-                markdownDeprecationMessage: ( nls.localize(
-                    'contributes.priority',
-                    'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
-                )),
+                markdownDeprecationMessage: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.priority', 'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'),
                 enum: [
                     "default" ,
                     "option" ,
                 ],
                 markdownEnumDescriptions: [
-                    ( nls.localize(
-                        'contributes.priority.default',
-                        'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
-                    )),
-                    ( nls.localize(
-                        'contributes.priority.option',
-                        'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
-                    )),
+                    nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.priority.default', 'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'),
+                    nls.localizeWithPath('vs/workbench/contrib/customEditor/common/extensionPoint', 'contributes.priority.option', 'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'),
                 ],
                 default: 'default'
             }

package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.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 { BaseBinaryResourceEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/binaryEditor';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
@@ -61,7 +61,7 @@ let BinaryFileEditor = class BinaryFileEditor extends BaseBinaryResourceEditor {
         }
     }
     getTitle() {
-        return this.input ? this.input.getName() : ( localize('binaryFileEditor', "Binary File Viewer"));
+        return this.input ? this.input.getName() : localizeWithPath('vs/workbench/contrib/files/browser/editors/binaryFileEditor', 'binaryFileEditor', "Binary File Viewer");
     }
 };
 BinaryFileEditor = BinaryFileEditor_1 = ( __decorate([

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.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 { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
@@ -60,7 +60,7 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize('textFileEditor', "Text File Editor"));
+        return localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'textFileEditor', "Text File Editor");
     }
     get input() {
         return this._input;
@@ -108,44 +108,37 @@ let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
         if (error.fileOperationResult === 0 ) {
             const actions = [];
             actions.push(toAction({
-                id: 'workbench.files.action.openFolder', label: ( localize('openFolder', "Open Folder")), run: async () => {
+                id: 'workbench.files.action.openFolder', label: localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'openFolder', "Open Folder"), run: async () => {
                     return this.hostService.openWindow([{ folderUri: input.resource }], { forceNewWindow: true });
                 }
             }));
             if (this.contextService.isInsideWorkspace(input.preferredResource)) {
                 actions.push(toAction({
-                    id: 'workbench.files.action.reveal', label: ( localize('reveal', "Reveal Folder")), run: async () => {
+                    id: 'workbench.files.action.reveal', label: localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'reveal', "Reveal Folder"), run: async () => {
                         await this.paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true);
                         return this.explorerService.select(input.preferredResource, true);
                     }
                 }));
             }
-            throw createEditorOpenError(localize('fileIsDirectory', "The file is not displayed in the text editor because it is a directory."), actions, { forceMessage: true });
+            throw createEditorOpenError(localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'fileIsDirectory', "The file is not displayed in the text editor because it is a directory."), actions, { forceMessage: true });
         }
         if (error.fileOperationResult === 7  && this.group) {
             let message;
             if (error instanceof TooLargeFileOperationError) {
-                message = ( localize(
-                    'fileTooLargeForHeapErrorWithSize',
-                    "The file is not displayed in the text editor because it is very large ({0}).",
-                    ByteSize.formatSize(error.size)
-                ));
+                message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'fileTooLargeForHeapErrorWithSize', "The file is not displayed in the text editor because it is very large ({0}).", ByteSize.formatSize(error.size));
             }
             else {
-                message = ( localize(
-                    'fileTooLargeForHeapErrorWithoutSize',
-                    "The file is not displayed in the text editor because it is very large."
-                ));
+                message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'fileTooLargeForHeapErrorWithoutSize', "The file is not displayed in the text editor because it is very large.");
             }
             throw createTooLargeFileError(this.group, input, options, message, this.preferencesService);
         }
         if (error.fileOperationResult === 1  && (await this.pathService.hasValidBasename(input.preferredResource))) {
-            const fileNotFoundError = createEditorOpenError(( new FileOperationError(( localize(
-                'unavailableResourceErrorEditorText',
-                "The editor could not be opened because the file was not found."
-            )), 1 )), [
+            const fileNotFoundError = createEditorOpenError(( new FileOperationError(
+                localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'unavailableResourceErrorEditorText', "The editor could not be opened because the file was not found."),
+                1
+            )), [
                 toAction({
-                    id: 'workbench.files.action.createMissingFile', label: ( localize('createFile', "Create File")), run: async () => {
+                    id: 'workbench.files.action.createMissingFile', label: localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileEditor', 'createFile', "Create File"), run: async () => {
                         await this.textFileService.create([{ resource: input.preferredResource }]);
                         return this.editorService.openEditor({
                             resource: input.preferredResource,