@codingame/monaco-vscode-quickaccess-service-override 7.1.0 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1"
   }
 }

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js

@@ -6,7 +6,7 @@ import { createSingleCallFunction } from 'vscode/vscode/vs/base/common/functiona
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LRUCache } from 'vscode/vscode/vs/base/common/map';
 import { TfIdfCalculator, normalizeTfIdfScores } from 'vscode/vscode/vs/base/common/tfIdf';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -19,7 +19,6 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
 var AbstractCommandsQuickAccessProvider_1, CommandsHistory_1;
-const _moduleId = "vs/platform/quickinput/browser/commandsQuickAccess";
 let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvider extends PickerQuickAccessProvider {
     static { AbstractCommandsQuickAccessProvider_1 = this; }
     static { this.PREFIX = '>'; }
@@ -135,20 +134,20 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         for (let i = 0; i < filteredCommandPicks.length; i++) {
             const commandPick = filteredCommandPicks[i];
             if (i === 0 && this.commandsHistory.peek(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 0, "recently used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4790, "recently used")) });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "similar commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4791, "similar commands")) });
                 addSuggestedSeparator = false;
             }
             if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 2, "commonly used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4792, "commonly used")) });
                 addOtherSeparator = true;
                 addCommonlyUsedSeparator = false;
             }
             if (addOtherSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 3, "other commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4793, "other commands")) });
                 addOtherSeparator = false;
             }
             commandPicks.push(this.toCommandPick(commandPick, runOptions));
@@ -165,7 +164,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 const commandPicks = ( (additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions))));
                 if (addSuggestedSeparator && commandPicks[0]?.type !== 'separator') {
-                    commandPicks.unshift({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "similar commands")) });
+                    commandPicks.unshift({ type: 'separator', label: ( localize(4793, "similar commands")) });
                 }
                 return commandPicks;
             })()
@@ -177,7 +176,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
         const ariaLabel = keybinding ?
-            ( localizeWithPath(_moduleId, 4, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
+            ( localize(4794, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
             commandPick.label;
         return {
             ...commandPick,
@@ -197,7 +196,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localizeWithPath(_moduleId, 5, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
+                        this.dialogService.error(( localize(4795, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
             }

package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -7,7 +7,6 @@ import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAcc
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 
 var HelpQuickAccessProvider_1;
-const _moduleId = "vs/platform/quickinput/browser/helpQuickAccess";
 let HelpQuickAccessProvider = class HelpQuickAccessProvider {
     static { HelpQuickAccessProvider_1 = this; }
     static { this.PREFIX = '?'; }
@@ -49,7 +48,7 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
                     prefix,
                     label,
                     keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                    ariaLabel: ( localizeWithPath(_moduleId, 0, "{0}, {1}", label, helpEntry.description)),
+                    ariaLabel: ( localize(4985, "{0}, {1}", label, helpEntry.description)),
                     description: helpEntry.description
                 };
             }))

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

@@ -1,4 +1,4 @@
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
@@ -9,7 +9,6 @@ import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/comm
 import { inQuickPickContext, getQuickNavigateHandler, defaultQuickAccessContext } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 
-const _moduleId = "vs/workbench/browser/actions/quickAccessActions";
 const globalQuickAccessKeybinding = {
     primary: KeyMod.CtrlCmd | KeyCode.KeyP,
     secondary: [KeyMod.CtrlCmd | KeyCode.KeyE],
@@ -105,7 +104,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpen',
-            title: ( localize2WithPath(_moduleId, 0, "Go to File...")),
+            title: ( localize2(1172, "Go to File...")),
             metadata: {
                 description: `Quick access`,
                 args: [{
@@ -133,7 +132,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpenWithModes',
-            title: ( localizeWithPath(_moduleId, 1, "Quick Open")),
+            title: ( localize(1173, "Quick Open")),
             icon: Codicon.search,
             menu: {
                 id: MenuId.CommandCenterCenter,
@@ -173,17 +172,17 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', ( localize2WithPath(_moduleId, 2, 'Navigate Next in Quick Open')), true, true);
+        super('workbench.action.quickOpenNavigateNext', ( localize2(1174, 'Navigate Next in Quick Open')), true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', ( localize2WithPath(_moduleId, 3, 'Navigate Previous in Quick Open')), false, true);
+        super('workbench.action.quickOpenNavigatePrevious', ( localize2(1175, 'Navigate Previous in Quick Open')), false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', ( localize2WithPath(_moduleId, 4, 'Select Next in Quick Open')), true, false, {
+        super('workbench.action.quickOpenSelectNext', ( localize2(1176, 'Select Next in Quick Open')), true, false, {
             weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,
@@ -193,7 +192,7 @@ class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', ( localize2WithPath(_moduleId, 5, 'Select Previous in Quick Open')), false, false, {
+        super('workbench.action.quickOpenSelectPrevious', ( localize2(1177, 'Select Previous in Quick Open')), false, false, {
             weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { AbstractGotoLineQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
@@ -11,7 +11,6 @@ import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 
-const _moduleId = "vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess";
 let GotoLineQuickAccessProvider = class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
     constructor(editorService, editorGroupService, configurationService) {
         super();
@@ -54,7 +53,7 @@ class GotoLineAction extends Action2 {
     constructor() {
         super({
             id: GotoLineAction.ID,
-            title: ( localize2WithPath(_moduleId, 0, 'Go to Line/Column...')),
+            title: ( localize2(1163, 'Go to Line/Column...')),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -72,12 +71,11 @@ registerAction2(GotoLineAction);
 ( (Registry.as(Extensions.Quickaccess))).registerQuickAccessProvider({
     ctor: GotoLineQuickAccessProvider,
     prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
-    placeholder: ( localizeWithPath(
-        _moduleId,
-        1,
+    placeholder: ( localize(
+        1164,
         "Type the line number and optional column to go to (e.g. 42:5 for line 42 and column 5)."
     )),
-    helpEntries: [{ description: ( localizeWithPath(_moduleId, 2, "Go to Line/Column")), commandId: GotoLineAction.ID }]
+    helpEntries: [{ description: ( localize(1165, "Go to Line/Column")), commandId: GotoLineAction.ID }]
 });
 
 export { GotoLineQuickAccessProvider };

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

@@ -7,7 +7,7 @@ import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Language } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { isLocalizedString } from 'vscode/vscode/vs/platform/action/common/action';
 import { MenuId, MenuItemAction, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -37,7 +37,6 @@ import { createKeybindingCommandQuery } from 'vscode/vscode/vs/workbench/service
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 
 var CommandsQuickAccessProvider_1;
-const _moduleId = "vs/workbench/contrib/quickaccess/browser/commandsQuickAccess";
 let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
     static { CommandsQuickAccessProvider_1 = this; }
     static { this.AI_RELATED_INFORMATION_MAX_PICKS = 5; }
@@ -54,7 +53,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
-                label: ( localizeWithPath(_moduleId, 0, "No matching commands")),
+                label: ( localize(1154, "No matching commands")),
                 commandId: ''
             }),
         }, instantiationService, keybindingService, commandService, telemetryService, dialogService);
@@ -103,7 +102,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                 ...picks,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(Codicon.gear),
-                        tooltip: ( localizeWithPath(_moduleId, 1, "Configure Keybinding")),
+                        tooltip: ( localize(1155, "Configure Keybinding")),
                     }],
                 trigger: () => {
                     this.preferencesService.openGlobalKeybindingSettings(false, { query: createKeybindingCommandQuery(picks.commandId, picks.commandWhen) });
@@ -141,7 +140,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
         if (defaultAgent) {
             additionalPicks.push({
-                label: ( localizeWithPath(_moduleId, 2, "Ask {0}: {1}", defaultAgent.fullName, filter)),
+                label: ( localize(1156, "Ask {0}: {1}", defaultAgent.fullName, filter)),
                 commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                 args: [filter]
             });
@@ -167,15 +166,15 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
     getGlobalCommandPicks() {
         const globalCommandPicks = [];
         const scopedContextKeyService = this.editorService.activeEditorPane?.scopedContextKeyService || this.editorGroupService.activeGroup.scopedContextKeyService;
-        const globalCommandsMenu = this.menuService.createMenu(MenuId.CommandPalette, scopedContextKeyService);
-        const globalCommandsMenuActions = globalCommandsMenu.getActions()
+        const globalCommandsMenu = this.menuService.getMenuActions(MenuId.CommandPalette, scopedContextKeyService);
+        const globalCommandsMenuActions = globalCommandsMenu
             .reduce((r, [, actions]) => [...r, ...actions], [])
             .filter(action => action instanceof MenuItemAction && action.enabled);
         for (const action of globalCommandsMenuActions) {
             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 = ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, label));
+                label = ( localize(1157, "{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;
@@ -194,7 +193,6 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                 commandDescription,
             });
         }
-        globalCommandsMenu.dispose();
         return globalCommandPicks;
     }
 };
@@ -219,7 +217,7 @@ class ShowAllCommandsAction extends Action2 {
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: ( localize2WithPath(_moduleId, 4, 'Show All Commands')),
+            title: ( localize2(1158, 'Show All Commands')),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 when: undefined,
@@ -237,7 +235,7 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: ( localize2WithPath(_moduleId, 5, 'Clear Command History')),
+            title: ( localize2(1159, 'Clear Command History')),
             f1: true
         });
     }
@@ -249,13 +247,9 @@ class ClearCommandHistoryAction extends Action2 {
         if (commandHistoryLength > 0) {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
-                message: ( localizeWithPath(
-                    _moduleId,
-                    6,
-                    "Do you want to clear the history of recently used commands?"
-                )),
-                detail: ( localizeWithPath(_moduleId, 7, "This action is irreversible!")),
-                primaryButton: ( localizeWithPath(_moduleId, 8, "&&Clear"))
+                message: ( localize(1160, "Do you want to clear the history of recently used commands?")),
+                detail: ( localize(1161, "This action is irreversible!")),
+                primaryButton: ( localize(1162, "&&Clear"))
             });
             if (!confirmed) {
                 return;

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { HelpQuickAccessProvider } from '../../../../platform/quickinput/browser/helpQuickAccess.js';
@@ -11,46 +11,40 @@ import { inQuickPickContext, getQuickNavigateHandler } from 'vscode/vscode/vs/wo
 import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 
-const _moduleId = "vs/workbench/contrib/quickaccess/browser/quickAccess.contribution";
 const quickAccessRegistry = ( (Registry.as(Extensions.Quickaccess)));
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: HelpQuickAccessProvider,
     prefix: HelpQuickAccessProvider.PREFIX,
-    placeholder: ( localizeWithPath(
-        _moduleId,
-        0,
+    placeholder: ( localize(
+        1178,
         "Type '{0}' to get help on the actions you can take from here.",
         HelpQuickAccessProvider.PREFIX
     )),
     helpEntries: [{
-            description: ( localizeWithPath(_moduleId, 1, "Show all Quick Access Providers")),
+            description: ( localize(1179, "Show all Quick Access Providers")),
             commandCenterOrder: 70,
-            commandCenterLabel: ( localizeWithPath(_moduleId, 2, 'More'))
+            commandCenterLabel: ( localize(1180, 'More'))
         }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: ViewQuickAccessProvider,
     prefix: ViewQuickAccessProvider.PREFIX,
     contextKey: 'inViewsPicker',
-    placeholder: ( localizeWithPath(
-        _moduleId,
-        3,
-        "Type the name of a view, output channel or terminal to open."
-    )),
-    helpEntries: [{ description: ( localizeWithPath(_moduleId, 4, "Open View")), commandId: OpenViewPickerAction.ID }]
+    placeholder: ( localize(1181, "Type the name of a view, output channel or terminal to open.")),
+    helpEntries: [{ description: ( localize(1182, "Open View")), commandId: OpenViewPickerAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: CommandsQuickAccessProvider,
     prefix: CommandsQuickAccessProvider.PREFIX,
     contextKey: 'inCommandsPicker',
-    placeholder: ( localizeWithPath(_moduleId, 5, "Type the name of a command to run.")),
-    helpEntries: [{ description: ( localizeWithPath(_moduleId, 6, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
+    placeholder: ( localize(1183, "Type the name of a command to run.")),
+    helpEntries: [{ description: ( localize(1184, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localizeWithPath(_moduleId, 7, "&&Command Palette..."))
+        title: ( localize(1185, "&&Command Palette..."))
     },
     order: 1
 });
@@ -58,7 +52,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localizeWithPath(_moduleId, 8, "Show All Commands"))
+        title: ( localize(1186, "Show All Commands"))
     },
     order: 2
 });
@@ -66,7 +60,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: OpenViewPickerAction.ID,
-        title: ( localizeWithPath(_moduleId, 9, "&&Open View..."))
+        title: ( localize(1187, "&&Open View..."))
     },
     order: 2
 });
@@ -74,7 +68,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'workbench.action.gotoLine',
-        title: ( localizeWithPath(_moduleId, 10, "Go to &&Line/Column..."))
+        title: ( localize(1188, "Go to &&Line/Column..."))
     },
     order: 1
 });
@@ -82,7 +76,7 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
     group: '1_command',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localizeWithPath(_moduleId, 11, "Command Palette..."))
+        title: ( localize(1189, "Command Palette..."))
     },
     order: 1
 });
@@ -91,7 +85,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     when: ( (EditorContextKeys.editorSimpleInput.toNegated())),
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localizeWithPath(_moduleId, 11, "Command Palette...")),
+        title: ( localize(1189, "Command Palette...")),
     },
     order: 1
 });

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
@@ -21,14 +21,13 @@ import { REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/de
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 
 var ViewQuickAccessProvider_1;
-const _moduleId = "vs/workbench/contrib/quickaccess/browser/viewQuickAccess";
 let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickAccessProvider {
     static { ViewQuickAccessProvider_1 = this; }
     static { this.PREFIX = 'view '; }
     constructor(viewDescriptorService, viewsService, outputService, terminalService, terminalGroupService, debugService, paneCompositeService, contextKeyService) {
         super(ViewQuickAccessProvider_1.PREFIX, {
             noResultsPick: {
-                label: ( localizeWithPath(_moduleId, 0, "No matching views")),
+                label: ( localize(4986, "No matching views")),
                 containerLabel: ''
             }
         });
@@ -116,9 +115,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(ViewContainerLocation.Sidebar, ( localizeWithPath(_moduleId, 1, "Side Bar")));
-        addPaneComposites(ViewContainerLocation.Panel, ( localizeWithPath(_moduleId, 2, "Panel")));
-        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localizeWithPath(_moduleId, 3, "Secondary Side Bar")));
+        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(4987, "Side Bar")));
+        addPaneComposites(ViewContainerLocation.Panel, ( localize(4988, "Panel")));
+        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(4989, "Secondary Side Bar")));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -133,16 +132,10 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         addPaneCompositeViews(ViewContainerLocation.AuxiliaryBar);
         this.terminalGroupService.groups.forEach((group, groupIndex) => {
             group.terminalInstances.forEach((terminal, terminalIndex) => {
-                const label = ( localizeWithPath(
-                    _moduleId,
-                    4,
-                    "{0}: {1}",
-                    `${groupIndex + 1}.${terminalIndex + 1}`,
-                    terminal.title
-                ));
+                const label = ( localize(4990, "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title));
                 viewEntries.push({
                     label,
-                    containerLabel: ( localizeWithPath(_moduleId, 5, "Terminal")),
+                    containerLabel: ( localize(4991, "Terminal")),
                     accept: async () => {
                         await this.terminalGroupService.showPanel(true);
                         this.terminalService.setActiveInstance(terminal);
@@ -154,7 +147,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             const label = session.name;
             viewEntries.push({
                 label,
-                containerLabel: ( localizeWithPath(_moduleId, 6, "Debug Console")),
+                containerLabel: ( localize(4992, "Debug Console")),
                 accept: async () => {
                     await this.debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
                     if (!this.viewsService.isViewVisible(REPL_VIEW_ID)) {
@@ -167,7 +160,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         for (const channel of channels) {
             viewEntries.push({
                 label: channel.label,
-                containerLabel: ( localizeWithPath(_moduleId, 7, "Output")),
+                containerLabel: ( localize(4993, "Output")),
                 accept: () => this.outputService.showChannel(channel.id)
             });
         }
@@ -196,7 +189,7 @@ class OpenViewPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: ( localize2WithPath(_moduleId, 8, 'Open View')),
+            title: ( localize2(4994, 'Open View')),
             category: Categories.View,
             f1: true
         });
@@ -215,7 +208,7 @@ class QuickAccessViewPickerAction extends Action2 {
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: ( localize2WithPath(_moduleId, 9, 'Quick Open View')),
+            title: ( localize2(4995, 'Quick Open View')),
             category: Categories.View,
             f1: false,
             keybinding: {

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { matchesScheme, Schemas } from 'vscode/vscode/vs/base/common/network';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -18,7 +18,6 @@ import { ITrustedDomainService } from 'vscode/vscode/vs/workbench/contrib/url/br
 import { readStaticTrustedDomains, configureOpenerTrustedDomainsHandler } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const _moduleId = "vs/workbench/contrib/url/browser/trustedDomainsValidator";
 let OpenerValidatorContributions = class OpenerValidatorContributions {
     constructor(_openerService, _storageService, _dialogService, _productService, _quickInputService, _editorService, _clipboardService, _telemetryService, _instantiationService, _configurationService, _workspaceTrustService, _trustedDomainService) {
         this._openerService = _openerService;
@@ -67,27 +66,26 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
             }
             const { result } = await this._dialogService.prompt({
                 type: Severity$1.Info,
-                message: ( localizeWithPath(
-                    _moduleId,
-                    0,
+                message: ( localize(
+                    4996,
                     'Do you want {0} to open the external website?',
                     this._productService.nameShort
                 )),
                 detail: typeof originalResource === 'string' ? originalResource : formattedLink,
                 buttons: [
                     {
-                        label: ( localizeWithPath(_moduleId, 1, '&&Open')),
+                        label: ( localize(4997, '&&Open')),
                         run: () => true
                     },
                     {
-                        label: ( localizeWithPath(_moduleId, 2, '&&Copy')),
+                        label: ( localize(4998, '&&Copy')),
                         run: () => {
                             this._clipboardService.writeText(typeof originalResource === 'string' ? originalResource : ( (resourceUri.toString(true))));
                             return false;
                         }
                     },
                     {
-                        label: ( localizeWithPath(_moduleId, 3, 'Configure &&Trusted Domains')),
+                        label: ( localize(4999, 'Configure &&Trusted Domains')),
                         run: async () => {
                             const { trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
                             const domainToOpen = `${scheme}://${authority}`;

package/vscode/src/vs/workbench/contrib/url/browser/url.contribution.js

@@ -1,5 +1,5 @@
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -18,12 +18,11 @@ import 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
-const _moduleId = "vs/workbench/contrib/url/browser/url.contribution";
 class OpenUrlAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.url.openUrl',
-            title: ( localize2WithPath(_moduleId, 0, 'Open URL')),
+            title: ( localize2(1190, 'Open URL')),
             category: Categories.Developer,
             f1: true
         });
@@ -31,7 +30,7 @@ class OpenUrlAction extends Action2 {
     async run(accessor) {
         const quickInputService = accessor.get(IQuickInputService);
         const urlService = accessor.get(IURLService);
-        return quickInputService.input({ prompt: ( localizeWithPath(_moduleId, 1, "URL to open")) }).then(input => {
+        return quickInputService.input({ prompt: ( localize(1191, "URL to open")) }).then(input => {
             if (input) {
                 const uri = ( (URI.parse(input)));
                 urlService.open(uri, { originalUrl: input });
@@ -60,9 +59,8 @@ configurationRegistry.registerConfiguration({
             scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
-            description: ( localizeWithPath(
-                _moduleId,
-                2,
+            description: ( localize(
+                1192,
                 "When enabled, trusted domain prompts will appear when opening links in trusted workspaces."
             ))
         }