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

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { CommandsHistory } from 'monaco-editor/esm/vs/platform/quickinput/browser/commandsQuickAccess.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { MenuId, MenuItemAction, Action2, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { raceTimeout, timeout } from 'monaco-editor/esm/vs/base/common/async.js';
-import { AbstractEditorCommandsQuickAccessProvider } from 'monaco-editor/esm/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js';
+import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
 import { Language } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
@@ -19,7 +19,7 @@ import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { TriggerAction } from 'monaco-editor/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
+import { TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { stripIcons } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
 import { isFirefox } from 'monaco-editor/esm/vs/base/browser/browser.js';
@@ -46,7 +46,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
-                label: ( localize('noCommandResults', "No matching commands")),
+                label: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'noCommandResults', "No matching commands"),
                 commandId: ''
             }),
         }, instantiationService, keybindingService, commandService, telemetryService, dialogService);
@@ -94,7 +94,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             ...picks,
             buttons: [{
                     iconClass: ThemeIcon.asClassName(Codicon.gear),
-                    tooltip: ( localize('configure keybinding', "Configure Keybinding")),
+                    tooltip: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'configure keybinding', "Configure Keybinding"),
                 }],
             trigger: () => {
                 this.preferencesService.openGlobalKeybindingSettings(false, { query: `@command:${picks.commandId}` });
@@ -131,7 +131,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const info = this.chatService.getProviderInfos()[0];
         if (info) {
             additionalPicks.push({
-                label: ( localize('askXInChat', "Ask {0}: {1}", info.displayName, filter)),
+                label: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'askXInChat', "Ask {0}: {1}", info.displayName, filter),
                 commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                 args: [filter]
             });
@@ -165,7 +165,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             let label = (typeof action.item.title === 'string' ? action.item.title : action.item.title.value) || action.item.id;
             const category = typeof action.item.category === 'string' ? action.item.category : action.item.category?.value;
             if (category) {
-                label = ( localize('commandWithCategory', "{0}: {1}", category, label));
+                label = localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'commandWithCategory', "{0}: {1}", category, label);
             }
             const aliasLabel = typeof action.item.title !== 'string' ? action.item.title.original : undefined;
             const aliasCategory = (category && action.item.category && typeof action.item.category !== 'string') ? action.item.category.original : undefined;
@@ -203,7 +203,7 @@ class ShowAllCommandsAction extends Action2 {
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: { value: ( localize('showTriggerActions', "Show All Commands")), original: 'Show All Commands' },
+            title: { value: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'showTriggerActions', "Show All Commands"), original: 'Show All Commands' },
             keybinding: {
                 weight: 200 ,
                 when: undefined,
@@ -221,7 +221,7 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: { value: ( localize('clearCommandHistory', "Clear Command History")), original: 'Clear Command History' },
+            title: { value: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'clearCommandHistory', "Clear Command History"), original: 'Clear Command History' },
             f1: true
         });
     }
@@ -233,12 +233,9 @@ class ClearCommandHistoryAction extends Action2 {
         if (commandHistoryLength > 0) {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
-                message: ( localize(
-                    'confirmClearMessage',
-                    "Do you want to clear the history of recently used commands?"
-                )),
-                detail: ( localize('confirmClearDetail', "This action is irreversible!")),
-                primaryButton: ( localize({ key: 'clearButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Clear"))
+                message: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'confirmClearMessage', "Do you want to clear the history of recently used commands?"),
+                detail: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', 'confirmClearDetail', "This action is irreversible!"),
+                primaryButton: localizeWithPath('vs/workbench/contrib/quickaccess/browser/commandsQuickAccess', { key: 'clearButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Clear")
             });
             if (!confirmed) {
                 return;

package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js

@@ -1,7 +1,7 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { HelpQuickAccessProvider } from 'monaco-editor/esm/vs/platform/quickinput/browser/helpQuickAccess.js';
+import { HelpQuickAccessProvider } from '../../../../platform/quickinput/browser/helpQuickAccess.js';
 import { ViewQuickAccessProvider, OpenViewPickerAction, QuickAccessViewPickerAction } from './viewQuickAccess.js';
 import { CommandsQuickAccessProvider, ShowAllCommandsAction, ClearCommandHistoryAction } from './commandsQuickAccess.js';
 import { MenuRegistry, MenuId, registerAction2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
@@ -13,42 +13,32 @@ const quickAccessRegistry = ( Registry.as(Extensions.Quickaccess));
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: HelpQuickAccessProvider,
     prefix: HelpQuickAccessProvider.PREFIX,
-    placeholder: ( localize(
-        'helpQuickAccessPlaceholder',
-        "Type '{0}' to get help on the actions you can take from here.",
-        HelpQuickAccessProvider.PREFIX
-    )),
+    placeholder: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'helpQuickAccessPlaceholder', "Type '{0}' to get help on the actions you can take from here.", HelpQuickAccessProvider.PREFIX),
     helpEntries: [{
-            description: ( localize('helpQuickAccess', "Show all Quick Access Providers")),
+            description: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'helpQuickAccess', "Show all Quick Access Providers"),
             commandCenterOrder: 70,
-            commandCenterLabel: ( localize('more', 'More'))
+            commandCenterLabel: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'more', 'More')
         }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: ViewQuickAccessProvider,
     prefix: ViewQuickAccessProvider.PREFIX,
     contextKey: 'inViewsPicker',
-    placeholder: ( localize(
-        'viewQuickAccessPlaceholder',
-        "Type the name of a view, output channel or terminal to open."
-    )),
-    helpEntries: [{ description: ( localize('viewQuickAccess', "Open View")), commandId: OpenViewPickerAction.ID }]
+    placeholder: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'viewQuickAccessPlaceholder', "Type the name of a view, output channel or terminal to open."),
+    helpEntries: [{ description: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'viewQuickAccess', "Open View"), commandId: OpenViewPickerAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: CommandsQuickAccessProvider,
     prefix: CommandsQuickAccessProvider.PREFIX,
     contextKey: 'inCommandsPicker',
-    placeholder: ( localize('commandsQuickAccessPlaceholder', "Type the name of a command to run.")),
-    helpEntries: [{ description: ( localize('commandsQuickAccess', "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
+    placeholder: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'commandsQuickAccessPlaceholder', "Type the name of a command to run."),
+    helpEntries: [{ description: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'commandsQuickAccess', "Show and Run Commands"), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(
-            { key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] },
-            "&&Command Palette..."
-        ))
+        title: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', { key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette...")
     },
     order: 1
 });
@@ -56,10 +46,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(
-            { key: 'miShowAllCommands', comment: ['&& denotes a mnemonic'] },
-            "Show All Commands"
-        ))
+        title: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', { key: 'miShowAllCommands', comment: ['&& denotes a mnemonic'] }, "Show All Commands")
     },
     order: 2
 });
@@ -67,10 +54,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: OpenViewPickerAction.ID,
-        title: ( localize(
-            { key: 'miOpenView', comment: ['&& denotes a mnemonic'] },
-            "&&Open View..."
-        ))
+        title: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', { key: 'miOpenView', comment: ['&& denotes a mnemonic'] }, "&&Open View...")
     },
     order: 2
 });
@@ -78,10 +62,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'workbench.action.gotoLine',
-        title: ( localize(
-            { key: 'miGotoLine', comment: ['&& denotes a mnemonic'] },
-            "Go to &&Line/Column..."
-        ))
+        title: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', { key: 'miGotoLine', comment: ['&& denotes a mnemonic'] }, "Go to &&Line/Column...")
     },
     order: 1
 });
@@ -89,7 +70,7 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
     group: '1_command',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize('commandPalette', "Command Palette..."))
+        title: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'commandPalette', "Command Palette...")
     },
     order: 1
 });
@@ -98,7 +79,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     when: ( EditorContextKeys.editorSimpleInput.toNegated()),
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize('commandPalette', "Command Palette...")),
+        title: localizeWithPath('vs/workbench/contrib/quickaccess/browser/quickAccess.contribution', 'commandPalette', "Command Palette..."),
     },
     order: 1
 });

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js

@@ -1,7 +1,7 @@
 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 { IQuickInputService, ItemActivation } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { PickerQuickAccessProvider } from 'monaco-editor/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
+import { PickerQuickAccessProvider } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
 import { IViewDescriptorService, IViewsService } from '../../../common/views.js';
 import { IOutputService } from '../../../services/output/common/output.js';
 import { ITerminalService, ITerminalGroupService } from '../../terminal/browser/terminal.js';
@@ -20,7 +20,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
     constructor(viewDescriptorService, viewsService, outputService, terminalService, terminalGroupService, debugService, paneCompositeService, contextKeyService) {
         super(ViewQuickAccessProvider_1.PREFIX, {
             noResultsPick: {
-                label: ( localize('noViewResults', "No matching views")),
+                label: localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'noViewResults', "No matching views"),
                 containerLabel: ''
             }
         });
@@ -108,9 +108,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(0 , ( localize('views', "Side Bar")));
-        addPaneComposites(1 , ( localize('panels', "Panel")));
-        addPaneComposites(2 , ( localize('secondary side bar', "Secondary Side Bar")));
+        addPaneComposites(0 , localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'views', "Side Bar"));
+        addPaneComposites(1 , localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'panels', "Panel"));
+        addPaneComposites(2 , localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'secondary side bar', "Secondary Side Bar"));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -125,15 +125,10 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         addPaneCompositeViews(2 );
         this.terminalGroupService.groups.forEach((group, groupIndex) => {
             group.terminalInstances.forEach((terminal, terminalIndex) => {
-                const label = ( localize(
-                    'terminalTitle',
-                    "{0}: {1}",
-                    `${groupIndex + 1}.${terminalIndex + 1}`,
-                    terminal.title
-                ));
+                const label = localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'terminalTitle', "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title);
                 viewEntries.push({
                     label,
-                    containerLabel: ( localize('terminals', "Terminal")),
+                    containerLabel: localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'terminals', "Terminal"),
                     accept: async () => {
                         await this.terminalGroupService.showPanel(true);
                         this.terminalService.setActiveInstance(terminal);
@@ -145,7 +140,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             const label = session.name;
             viewEntries.push({
                 label,
-                containerLabel: ( localize('debugConsoles', "Debug Console")),
+                containerLabel: localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'debugConsoles', "Debug Console"),
                 accept: async () => {
                     await this.debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
                     if (!this.viewsService.isViewVisible(REPL_VIEW_ID)) {
@@ -158,7 +153,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         for (const channel of channels) {
             viewEntries.push({
                 label: channel.label,
-                containerLabel: ( localize('channels', "Output")),
+                containerLabel: localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'channels', "Output"),
                 accept: () => this.outputService.showChannel(channel.id)
             });
         }
@@ -187,7 +182,7 @@ class OpenViewPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: { value: ( localize('openView', "Open View")), original: 'Open View' },
+            title: { value: localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'openView', "Open View"), original: 'Open View' },
             category: Categories.View,
             f1: true
         });
@@ -206,7 +201,7 @@ class QuickAccessViewPickerAction extends Action2 {
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: { value: ( localize('quickOpenView', "Quick Open View")), original: 'Quick Open View' },
+            title: { value: localizeWithPath('vs/workbench/contrib/quickaccess/browser/viewQuickAccess', 'quickOpenView', "Quick Open View"), original: 'Quick Open View' },
             category: Categories.View,
             f1: false,
             keybinding: {

package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js

@@ -20,7 +20,7 @@ let SwitchQuickDiffViewItem = class SwitchQuickDiffViewItem extends SelectAction
         const peekTitleColor = theme.getColor(peekViewTitleBackground);
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
-        super(null, action, items, startingSelection, contextViewService, styles, { ariaLabel: ( nls.localize('remotes', 'Switch quick diff base')) });
+        super(null, action, items, startingSelection, contextViewService, styles, { ariaLabel: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtyDiffSwitcher', 'remotes', 'Switch quick diff base') });
         this.optionsItems = items;
     }
     setSelection(provider) {
@@ -41,7 +41,7 @@ SwitchQuickDiffViewItem = ( __decorate([
 ], SwitchQuickDiffViewItem));
 class SwitchQuickDiffBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( nls.localize('quickDiff.base.switch', "Switch Quick Diff Base")); }
+    static { this.LABEL = nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtyDiffSwitcher', 'quickDiff.base.switch', "Switch Quick Diff Base"); }
     constructor(callback) {
         super(SwitchQuickDiffBaseAction.ID, SwitchQuickDiffBaseAction.LABEL, undefined, undefined);
         this.callback = callback;

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -202,36 +202,14 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         let detail;
         if (!this.shouldUseDropdown()) {
             detail = this.model.changes.length > 1
-                ? ( nls.localize(
-                'changes',
-                "{0} - {1} of {2} changes",
-                label,
-                providerIndex + 1,
-                providerChanges.length
-            ))
-                : ( nls.localize(
-                'change',
-                "{0} - {1} of {2} change",
-                label,
-                providerIndex + 1,
-                providerChanges.length
-            ));
+                ? nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'changes', "{0} - {1} of {2} changes", label, providerIndex + 1, providerChanges.length)
+                : nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'change', "{0} - {1} of {2} change", label, providerIndex + 1, providerChanges.length);
             this.dropdownContainer.style.display = 'none';
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( nls.localize(
-                'multiChanges',
-                "{0} of {1} changes",
-                providerIndex + 1,
-                providerChanges.length
-            ))
-                : ( nls.localize(
-                'multiChange',
-                "{0} of {1} change",
-                providerIndex + 1,
-                providerChanges.length
-            ));
+                ? nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'multiChanges', "{0} of {1} changes", providerIndex + 1, providerChanges.length)
+                : nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'multiChange', "{0} of {1} change", providerIndex + 1, providerChanges.length);
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
@@ -289,7 +267,13 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this._actionbarWidget.clear();
         this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
         this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(( new Action('peekview.close', ( nls.localize('label.close', "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose())), { label: false, icon: true });
+        this._actionbarWidget.push(( new Action(
+            'peekview.close',
+            nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'label.close', "Close"),
+            ThemeIcon.asClassName(Codicon.close),
+            true,
+            () => this.dispose()
+        )), { label: false, icon: true });
     }
     _fillHead(container) {
         super._fillHead(container, true);
@@ -393,7 +377,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( nls.localize('show previous change', "Show Previous Change")),
+            label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'show previous change', "Show Previous Change"),
             alias: 'Show Previous Change',
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024  | 512  | 61 , weight: 100  }
@@ -420,7 +404,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( nls.localize('show next change', "Show Next Change")),
+            label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'show next change', "Show Next Change"),
             alias: 'Show Next Change',
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512  | 61 , weight: 100  }
@@ -447,10 +431,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( nls.localize(
-            { key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] },
-            "Next &&Change"
-        ))
+        title: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', { key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] }, "Next &&Change")
     },
     order: 1
 });
@@ -458,10 +439,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( nls.localize(
-            { key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] },
-            "Previous &&Change"
-        ))
+        title: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', { key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] }, "Previous &&Change")
     },
     order: 2
 });
@@ -469,7 +447,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( nls.localize('move to previous change', "Go to Previous Change")),
+            label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'move to previous change', "Go to Previous Change"),
             alias: 'Go to Previous Change',
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024  | 512  | 63 , weight: 100  }
@@ -503,7 +481,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( nls.localize('move to next change', "Go to Next Change")),
+            label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'move to next change', "Go to Next Change"),
             alias: 'Go to Next Change',
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512  | 63 , weight: 100  }
@@ -821,67 +799,40 @@ const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackg
     light: '#2090D3',
     hcDark: '#1B81A8',
     hcLight: '#2090D3'
-}, ( nls.localize(
-    'editorGutterModifiedBackground',
-    "Editor gutter background color for lines that are modified."
-)));
+}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'editorGutterModifiedBackground', "Editor gutter background color for lines that are modified."));
 const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
     dark: '#487E02',
     light: '#48985D',
     hcDark: '#487E02',
     hcLight: '#48985D'
-}, ( nls.localize(
-    'editorGutterAddedBackground',
-    "Editor gutter background color for lines that are added."
-)));
+}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'editorGutterAddedBackground', "Editor gutter background color for lines that are added."));
 const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
     dark: editorErrorForeground,
     light: editorErrorForeground,
     hcDark: editorErrorForeground,
     hcLight: editorErrorForeground
-}, ( nls.localize(
-    'editorGutterDeletedBackground',
-    "Editor gutter background color for lines that are deleted."
-)));
+}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
 registerColor('minimapGutter.modifiedBackground', {
     dark: editorGutterModifiedBackground,
     light: editorGutterModifiedBackground,
     hcDark: editorGutterModifiedBackground,
     hcLight: editorGutterModifiedBackground
-}, ( nls.localize(
-    'minimapGutterModifiedBackground',
-    "Minimap gutter background color for lines that are modified."
-)));
+}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
 registerColor('minimapGutter.addedBackground', {
     dark: editorGutterAddedBackground,
     light: editorGutterAddedBackground,
     hcDark: editorGutterAddedBackground,
     hcLight: editorGutterAddedBackground
-}, ( nls.localize(
-    'minimapGutterAddedBackground',
-    "Minimap gutter background color for lines that are added."
-)));
+}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
 registerColor('minimapGutter.deletedBackground', {
     dark: editorGutterDeletedBackground,
     light: editorGutterDeletedBackground,
     hcDark: editorGutterDeletedBackground,
     hcLight: editorGutterDeletedBackground
-}, ( nls.localize(
-    'minimapGutterDeletedBackground',
-    "Minimap gutter background color for lines that are deleted."
-)));
-registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, ( nls.localize(
-    'overviewRulerModifiedForeground',
-    'Overview ruler marker color for modified content.'
-)));
-registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, ( nls.localize(
-    'overviewRulerAddedForeground',
-    'Overview ruler marker color for added content.'
-)));
-registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, ( nls.localize(
-    'overviewRulerDeletedForeground',
-    'Overview ruler marker color for deleted content.'
-)));
+}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
+registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.'));
+registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'overviewRulerAddedForeground', 'Overview ruler marker color for added content.'));
+registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
 async function getOriginalResource(quickDiffService, uri, language, isSynchronized) {
     const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);
     return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js

@@ -4,7 +4,7 @@ import { compare, firstNonWhitespaceIndex, compareSubstring } from 'monaco-edito
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
 import { SnippetParser } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { ISnippetsService } from './snippets.js';
 import { Snippet } from './snippetsFile.js';
 import { isPatternInWord } from 'monaco-editor/esm/vs/base/common/filters.js';
@@ -24,12 +24,7 @@ class SnippetCompletion {
     constructor(snippet, range) {
         this.snippet = snippet;
         this.label = { label: snippet.prefix, description: snippet.name };
-        this.detail = ( localize(
-            'detail.snippet',
-            "{0} ({1})",
-            snippet.description || snippet.name,
-            snippet.source
-        ));
+        this.detail = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCompletionProvider', 'detail.snippet', "{0} ({1})", snippet.description || snippet.name, snippet.source);
         this.insertText = snippet.codeSnippet;
         this.extensionId = snippet.extensionId;
         this.range = range;
@@ -117,20 +112,10 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
             const item = suggestions[i];
             let to = i + 1;
             for (; to < suggestions.length && item.label === suggestions[to].label; to++) {
-                suggestions[to].label.label = ( localize(
-                    'snippetSuggest.longLabel',
-                    "{0}, {1}",
-                    suggestions[to].label.label,
-                    suggestions[to].snippet.name
-                ));
+                suggestions[to].label.label = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCompletionProvider', 'snippetSuggest.longLabel', "{0}, {1}", suggestions[to].label.label, suggestions[to].snippet.name);
             }
             if (to > i + 1) {
-                suggestions[i].label.label = ( localize(
-                    'snippetSuggest.longLabel',
-                    "{0}, {1}",
-                    suggestions[i].label.label,
-                    suggestions[i].snippet.name
-                ));
+                suggestions[i].label.label = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCompletionProvider', 'snippetSuggest.longLabel', "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name);
                 i = to;
             }
         }

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js

@@ -1,5 +1,5 @@
 import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { extname, basename } from 'monaco-editor/esm/vs/base/common/path.js';
 import { SnippetParser, Placeholder, Variable, Text } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
 import { KnownSnippetVariableNames } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetVariables.js';
@@ -200,14 +200,14 @@ class SnippetFile {
             source = this._extension.displayName || this._extension.name;
         }
         else if (this.source === 2 ) {
-            source = ( localize('source.workspaceSnippetGlobal', "Workspace Snippet"));
+            source = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsFile', 'source.workspaceSnippetGlobal', "Workspace Snippet");
         }
         else {
             if (this.isGlobalSnippets) {
-                source = ( localize('source.userSnippetGlobal', "Global User Snippet"));
+                source = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsFile', 'source.userSnippetGlobal', "Global User Snippet");
             }
             else {
-                source = ( localize('source.userSnippet', "User Snippet"));
+                source = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsFile', 'source.userSnippet', "User Snippet");
             }
         }
         for (const _prefix of Iterable.wrap(prefix)) {