@codingame/monaco-vscode-debug-service-override 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.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 { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { $ as $$1, append, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
@@ -31,14 +31,16 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { defaultSelectBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibilityCommandId } from 'vscode/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 
 var StartDebugActionViewItem_1;
-const _moduleId = "vs/workbench/contrib/debug/browser/debugActionViewItems";
 const $ = $$1;
 let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseActionViewItem {
     static { StartDebugActionViewItem_1 = this; }
     static { this.SEPARATOR = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500'; }
-    constructor(context, action, options, debugService, configurationService, commandService, contextService, contextViewService, keybindingService, hoverService) {
+    constructor(context, action, options, debugService, configurationService, commandService, contextService, contextViewService, keybindingService, hoverService, contextKeyService) {
         super(context, action, options);
         this.context = context;
         this.debugService = debugService;
@@ -47,6 +49,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         this.contextService = contextService;
         this.keybindingService = keybindingService;
         this.hoverService = hoverService;
+        this.contextKeyService = contextKeyService;
         this.debugOptions = [];
         this.selected = 0;
         this.providers = [];
@@ -56,7 +59,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             -1,
             contextViewService,
             defaultSelectBoxStyles,
-            { ariaLabel: ( localizeWithPath(_moduleId, 0, 'Debug Launch Configurations')) }
+            { ariaLabel: ( localize(10234, 'Debug Launch Configurations')) }
         )));
         this.selectBox.setFocusable(false);
         this.toDispose.push(this.selectBox);
@@ -81,7 +84,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         const title = this.action.label + keybindingLabel;
         this.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.start, title));
         this.start.setAttribute('role', 'button');
-        this.start.ariaLabel = title;
+        this._setAriaLabel(title);
         this.toDispose.push(addDisposableListener(this.start, EventType.CLICK, () => {
             this.start.blur();
             if (this.debugService.state !== State.Initializing) {
@@ -214,7 +217,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             });
         });
         if (this.debugOptions.length === 0) {
-            this.debugOptions.push({ label: ( localizeWithPath(_moduleId, 1, "No Configurations")), handler: async () => false });
+            this.debugOptions.push({ label: ( localize(10235, "No Configurations")), handler: async () => false });
         }
         this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
         disabledIdxs.push(this.debugOptions.length - 1);
@@ -232,7 +235,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             });
         });
         manager.getLaunches().filter(l => !l.hidden).forEach(l => {
-            const label = inWorkspace ? ( localizeWithPath(_moduleId, 2, "Add Config ({0})...", l.name)) : ( localizeWithPath(_moduleId, 3, "Add Configuration..."));
+            const label = inWorkspace ? ( localize(10236, "Add Config ({0})...", l.name)) : ( localize(10237, "Add Configuration..."));
             this.debugOptions.push({
                 label, handler: async () => {
                     await this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( (l.uri.toString())));
@@ -244,6 +247,25 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             (data, index) => ({ text: data.label, isDisabled: disabledIdxs.indexOf(index) !== -1 })
         ))), this.selected);
     }
+    _setAriaLabel(title) {
+        let ariaLabel = title;
+        let keybinding;
+        const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Debug);
+        if (verbose) {
+            keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this.contextKeyService)?.getLabel() ?? undefined;
+        }
+        if (keybinding) {
+            ariaLabel = ( localize(10238, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+        }
+        else {
+            ariaLabel = ( localize(
+                10239,
+                "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
+                ariaLabel
+            ));
+        }
+        this.start.ariaLabel = ariaLabel;
+    }
 };
 StartDebugActionViewItem = StartDebugActionViewItem_1 = ( (__decorate([
     ( (__param(3, IDebugService))),
@@ -252,11 +274,12 @@ StartDebugActionViewItem = StartDebugActionViewItem_1 = ( (__decorate([
     ( (__param(6, IWorkspaceContextService))),
     ( (__param(7, IContextViewService))),
     ( (__param(8, IKeybindingService))),
-    ( (__param(9, IHoverService)))
+    ( (__param(9, IHoverService))),
+    ( (__param(10, IContextKeyService)))
 ], StartDebugActionViewItem)));
 let FocusSessionActionViewItem = class FocusSessionActionViewItem extends SelectActionViewItem {
     constructor(action, session, debugService, contextViewService, configurationService) {
-        super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localizeWithPath(_moduleId, 4, 'Debug Session')) });
+        super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(10240, 'Debug Session')) });
         this.debugService = debugService;
         this.configurationService = configurationService;
         this._register(this.debugService.getViewModel().onDidFocusSession(() => {

package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js

@@ -5,7 +5,7 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-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 { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -25,7 +25,6 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugAdapterManager";
 const jsonRegistry = ( (Registry.as(Extensions.JSONContribution)));
 let AdapterManager = class AdapterManager extends Disposable {
     constructor(delegate, editorService, configurationService, quickInputService, instantiationService, commandService, extensionService, contextKeyService, languageService, dialogService, lifecycleService) {
@@ -73,11 +72,7 @@ let AdapterManager = class AdapterManager extends Disposable {
             delta.added.forEach(added => {
                 added.value.forEach(rawAdapter => {
                     if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
-                        added.collector.error(( localizeWithPath(
-                            _moduleId,
-                            0,
-                            "Debugger 'type' can not be omitted and must be of type 'string'."
-                        )));
+                        added.collector.error(( localize(5702, "Debugger 'type' can not be omitted and must be of type 'string'.")));
                     }
                     if (rawAdapter.type !== '*') {
                         const existing = this.getDebugger(rawAdapter.type);
@@ -120,18 +115,16 @@ let AdapterManager = class AdapterManager extends Disposable {
                 properties: {
                     'name': {
                         type: 'string',
-                        description: ( localizeWithPath(
-                            _moduleId,
-                            1,
+                        description: ( localize(
+                            5703,
                             "Name of configuration; appears in the launch configuration dropdown menu."
                         )),
                         default: 'Launch'
                     },
                     'debugServer': {
                         type: 'number',
-                        description: ( localizeWithPath(
-                            _moduleId,
-                            2,
+                        description: ( localize(
+                            5704,
                             "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"
                         )),
                         default: 4711
@@ -142,7 +135,7 @@ let AdapterManager = class AdapterManager extends Disposable {
                             }],
                         default: '',
                         defaultSnippets: [{ body: { task: '', type: '' } }],
-                        description: ( localizeWithPath(_moduleId, 3, "Task to run before debug session starts."))
+                        description: ( localize(5705, "Task to run before debug session starts."))
                     },
                     'postDebugTask': {
                         anyOf: [taskSchema, {
@@ -150,15 +143,14 @@ let AdapterManager = class AdapterManager extends Disposable {
                             }],
                         default: '',
                         defaultSnippets: [{ body: { task: '', type: '' } }],
-                        description: ( localizeWithPath(_moduleId, 4, "Task to run after debug session ends."))
+                        description: ( localize(5706, "Task to run after debug session ends."))
                     },
                     'presentation': presentationSchema,
                     'internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
                     'suppressMultipleSessionWarning': {
                         type: 'boolean',
-                        description: ( localizeWithPath(
-                            _moduleId,
-                            5,
+                        description: ( localize(
+                            5707,
                             "Disable the warning when trying to start the same debug configuration more than once."
                         )),
                         default: true
@@ -313,13 +305,12 @@ let AdapterManager = class AdapterManager extends Disposable {
             }
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity$1.Warning,
-                message: ( localizeWithPath(
-                    _moduleId,
-                    6,
+                message: ( localize(
+                    5708,
                     "You don't have an extension for debugging {0}. Should we find a {0} extension in the Marketplace?",
                     languageLabel
                 )),
-                primaryButton: ( localizeWithPath(_moduleId, 7, "&&Find {0} extension", languageLabel))
+                primaryButton: ( localize(5709, "&&Find {0} extension", languageLabel))
             });
             if (confirmed) {
                 await this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
@@ -345,7 +336,7 @@ let AdapterManager = class AdapterManager extends Disposable {
         });
         const picks = [];
         if (suggestedCandidates.length > 0) {
-            picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 8, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
+            picks.push({ type: 'separator', label: ( localize(5710, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
         }
         if (otherCandidates.length > 0) {
             if (picks.length > 0) {
@@ -353,8 +344,8 @@ let AdapterManager = class AdapterManager extends Disposable {
             }
             picks.push(...( (otherCandidates.map(c => ({ label: c.label, debugger: c })))));
         }
-        picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localizeWithPath(_moduleId, 9, "Install an extension for {0}...", languageLabel)) : ( localizeWithPath(_moduleId, 10, "Install extension...")) });
-        const placeHolder = ( localizeWithPath(_moduleId, 11, "Select debugger"));
+        picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5711, "Install an extension for {0}...", languageLabel)) : ( localize(5712, "Install extension...")) });
+        const placeHolder = ( localize(5713, "Select debugger"));
         return this.quickInputService.pick(picks, { activeItem: picks[0], placeHolder })
             .then(picked => {
             if (picked && picked.debugger) {

package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js

@@ -9,7 +9,7 @@ import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -35,7 +35,6 @@ import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/com
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugConfigurationManager";
 const jsonRegistry = ( (Registry.as(Extensions.JSONContribution)));
 jsonRegistry.registerSchema(launchSchemaId, launchSchema);
 const DEBUG_SELECTED_CONFIG_NAME_KEY = 'debug.selectedconfigname';
@@ -192,7 +191,7 @@ let ConfigurationManager = class ConfigurationManager {
                                     config,
                                     buttons: [{
                                             iconClass: ThemeIcon.asClassName(debugConfigure),
-                                            tooltip: ( localizeWithPath(_moduleId, 0, "Edit Debug Configuration in launch.json"))
+                                            tooltip: ( localize(5748, "Edit Debug Configuration in launch.json"))
                                         }],
                                     launch
                                 }))))));
@@ -201,7 +200,7 @@ let ConfigurationManager = class ConfigurationManager {
                         const disposables = ( (new DisposableStore()));
                         const input = disposables.add(this.quickInputService.createQuickPick());
                         input.busy = true;
-                        input.placeholder = ( localizeWithPath(_moduleId, 1, "Select Launch Configuration"));
+                        input.placeholder = ( localize(5749, "Select Launch Configuration"));
                         const chosenPromise = ( (new Promise(resolve => {
                             disposables.add(input.onDidAccept(() => resolve(input.activeItems[0])));
                             disposables.add(input.onDidTriggerItemButton(async (context) => {
@@ -522,9 +521,8 @@ let Launch = class Launch extends AbstractLaunch {
                 await this.textFileService.write(resource, content);
             }
             catch (error) {
-                throw ( (new Error(localizeWithPath(
-                    _moduleId,
-                    2,
+                throw ( (new Error(localize(
+                    5750,
                     "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).",
                     error.message
                 ))));
@@ -581,7 +579,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
         return this.contextService.getWorkspace().configuration;
     }
     get name() {
-        return ( localizeWithPath(_moduleId, 3, "workspace"));
+        return ( localize(5751, "workspace"));
     }
     getConfig() {
         return this.configurationService.inspect('launch').workspaceValue;
@@ -625,7 +623,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
         return this.preferencesService.userSettingsResource;
     }
     get name() {
-        return ( localizeWithPath(_moduleId, 4, "user settings"));
+        return ( localize(5752, "user settings"));
     }
     get hidden() {
         return true;

package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
-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 { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -8,7 +8,6 @@ import { DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID } from 'vscode/v
 import { REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugConsoleQuickAccess";
 let DebugConsoleQuickAccess = class DebugConsoleQuickAccess extends PickerQuickAccessProvider {
     constructor(_debugService, _viewsService, _commandService) {
         super(DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, { canAcceptInBackground: true });
@@ -27,7 +26,7 @@ let DebugConsoleQuickAccess = class DebugConsoleQuickAccess extends PickerQuickA
         if (debugConsolePicks.length > 0) {
             debugConsolePicks.push({ type: 'separator' });
         }
-        const createTerminalLabel = ( localizeWithPath(_moduleId, 0, "Start a New Debug Session"));
+        const createTerminalLabel = ( localize(5910, "Start a New Debug Session"));
         debugConsolePicks.push({
             label: `$(plus) ${createTerminalLabel}`,
             ariaLabel: createTerminalLabel,

package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js

@@ -7,7 +7,7 @@ import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -24,14 +24,13 @@ import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/c
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugEditorActions";
 class ToggleBreakpointAction extends Action2 {
     constructor() {
         super({
             id: 'editor.debug.action.toggleBreakpoint',
             title: {
-                ...( localize2WithPath(_moduleId, 0, "Debug: Toggle Breakpoint")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "Toggle &&Breakpoint")),
+                ...( localize2(5911, "Debug: Toggle Breakpoint")),
+                mnemonicTitle: ( localize(5912, "Toggle &&Breakpoint")),
             },
             f1: true,
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -90,12 +89,12 @@ class ConditionalBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.conditionalBreakpoint',
-            label: ( localizeWithPath(_moduleId, 2, "Debug: Add Conditional Breakpoint...")),
+            label: ( localize(5913, "Debug: Add Conditional Breakpoint...")),
             alias: 'Debug: Add Conditional Breakpoint...',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localizeWithPath(_moduleId, 3, "&&Conditional Breakpoint...")),
+                title: ( localize(5914, "&&Conditional Breakpoint...")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -114,13 +113,13 @@ class LogPointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.addLogPoint',
-            label: ( localizeWithPath(_moduleId, 4, "Debug: Add Logpoint...")),
+            label: ( localize(5915, "Debug: Add Logpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Add Logpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localizeWithPath(_moduleId, 5, "&&Logpoint...")),
+                    title: ( localize(5916, "&&Logpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -140,13 +139,13 @@ class TriggerByBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.triggerByBreakpoint',
-            label: ( localizeWithPath(_moduleId, 6, "Debug: Add Triggered Breakpoint...")),
+            label: ( localize(5917, "Debug: Add Triggered Breakpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Triggered Breakpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localizeWithPath(_moduleId, 7, "&&Triggered Breakpoint...")),
+                    title: ( localize(5918, "&&Triggered Breakpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -166,12 +165,12 @@ class EditBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.editBreakpoint',
-            label: ( localizeWithPath(_moduleId, 8, "Debug: Edit Breakpoint")),
+            label: ( localize(5919, "Debug: Edit Breakpoint")),
             alias: 'Debug: Edit Existing Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localizeWithPath(_moduleId, 9, "&&Edit Breakpoint")),
+                title: ( localize(5920, "&&Edit Breakpoint")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -206,8 +205,8 @@ class OpenDisassemblyViewAction extends Action2 {
         super({
             id: OpenDisassemblyViewAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 10, "Open Disassembly View")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 11, "&&DisassemblyView")),
+                ...( localize2(5921, "Open Disassembly View")),
+                mnemonicTitle: ( localize(5922, "&&DisassemblyView")),
             },
             precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
             menu: [
@@ -258,11 +257,11 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
         super({
             id: ToggleDisassemblyViewSourceCodeAction.ID,
             title: {
-                ...( localize2WithPath(_moduleId, 12, "Toggle Source Code in Disassembly View")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 13, "&&ToggleSource")),
+                ...( localize2(5923, "Toggle Source Code in Disassembly View")),
+                mnemonicTitle: ( localize(5924, "&&ToggleSource")),
             },
             metadata: {
-                description: ( localize2WithPath(_moduleId, 14, 'Shows or hides source code in disassembly'))
+                description: ( localize2(5925, 'Shows or hides source code in disassembly'))
             },
             f1: true,
         });
@@ -277,7 +276,7 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
 }
 class RunToCursorAction extends EditorAction {
     static { this.ID = 'editor.debug.action.runToCursor'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 15, "Run to Cursor")); }
+    static { this.LABEL = ( localize2(5926, "Run to Cursor")); }
     constructor() {
         super({
             id: RunToCursorAction.ID,
@@ -314,7 +313,7 @@ class RunToCursorAction extends EditorAction {
 }
 class SelectionToReplAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToRepl'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 16, "Evaluate in Debug Console")); }
+    static { this.LABEL = ( localize2(5927, "Evaluate in Debug Console")); }
     constructor() {
         super({
             id: SelectionToReplAction.ID,
@@ -349,7 +348,7 @@ class SelectionToReplAction extends EditorAction {
 }
 class SelectionToWatchExpressionsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToWatch'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 17, "Add to Watch")); }
+    static { this.LABEL = ( localize2(5928, "Add to Watch")); }
     constructor() {
         super({
             id: SelectionToWatchExpressionsAction.ID,
@@ -394,7 +393,7 @@ class ShowDebugHoverAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.showDebugHover',
-            label: ( localizeWithPath(_moduleId, 18, "Debug: Show Hover")),
+            label: ( localize(5929, "Debug: Show Hover")),
             alias: 'Debug: Show Hover',
             precondition: CONTEXT_IN_DEBUG_MODE,
             kbOpts: {
@@ -412,10 +411,10 @@ class ShowDebugHoverAction extends EditorAction {
         return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
     }
 }
-const NO_TARGETS_MESSAGE = ( localizeWithPath(_moduleId, 19, "Step targets are not available here"));
+const NO_TARGETS_MESSAGE = ( localize(5930, "Step targets are not available here"));
 class StepIntoTargetsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.stepIntoTargets'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 20, "Step Into Target")); }
+    static { this.LABEL = ( localize(5931, "Step Into Target")); }
     constructor() {
         super({
             id: StepIntoTargetsAction.ID,
@@ -527,7 +526,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(true, {
             id: 'editor.debug.action.goToNextBreakpoint',
-            label: ( localizeWithPath(_moduleId, 21, "Debug: Go to Next Breakpoint")),
+            label: ( localize(5932, "Debug: Go to Next Breakpoint")),
             alias: 'Debug: Go to Next Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
@@ -537,7 +536,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(false, {
             id: 'editor.debug.action.goToPreviousBreakpoint',
-            label: ( localizeWithPath(_moduleId, 22, "Debug: Go to Previous Breakpoint")),
+            label: ( localize(5933, "Debug: Go to Previous Breakpoint")),
             alias: 'Debug: Go to Previous Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
@@ -547,7 +546,7 @@ class CloseExceptionWidgetAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.closeExceptionWidget',
-            label: ( localizeWithPath(_moduleId, 23, "Close Exception Widget")),
+            label: ( localize(5934, "Close Exception Widget")),
             alias: 'Close Exception Widget',
             precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
             kbOpts: {

package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js

@@ -33,7 +33,7 @@ import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/service
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
 import { HoverStartMode, HoverStartSource } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverOperation';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -58,7 +58,6 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 
-const _moduleId = "vs/workbench/contrib/debug/browser/debugEditorContribution";
 const MAX_NUM_INLINE_VALUES = 100;
 const MAX_INLINE_DECORATOR_LENGTH = 150;
 const MAX_TOKENIZATION_LINE_LEN = 500;
@@ -68,8 +67,8 @@ registerColor('editor.inlineValuesForeground', {
     light: '#00000080',
     hcDark: '#ffffff80',
     hcLight: '#00000080'
-}, ( localizeWithPath(_moduleId, 0, "Color for the debug inline value text.")));
-registerColor('editor.inlineValuesBackground', '#ffc80033', ( localizeWithPath(_moduleId, 1, "Color for the debug inline value background.")));
+}, ( localize(5935, "Color for the debug inline value text.")));
+registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5936, "Color for the debug inline value background.")));
 class InlineSegment {
     constructor(column, text) {
         this.column = column;

package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js

@@ -13,7 +13,7 @@ import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOption
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -41,7 +41,6 @@ import { Variable, Expression, VisualizedExpression } from 'vscode/vscode/vs/wor
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 var DebugHoverWidget_1;
-const _moduleId = "vs/workbench/contrib/debug/browser/debugHover";
 const $ = $$1;
 var ShowDebugHoverResult;
 ( ((function(ShowDebugHoverResult) {
@@ -101,9 +100,8 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.treeContainer = append(this.complexValueContainer, $('.debug-hover-tree'));
         this.treeContainer.setAttribute('role', 'tree');
         const tip = append(this.complexValueContainer, $('.tip'));
-        tip.textContent = ( localizeWithPath(
-            _moduleId,
-            0,
+        tip.textContent = ( localize(
+            10226,
             'Hold {0} key to switch to editor language hover',
             isMacintosh ? 'Option' : 'Alt'
         ));
@@ -339,16 +337,10 @@ DebugHoverWidget = DebugHoverWidget_1 = ( (__decorate([
 ], DebugHoverWidget)));
 class DebugHoverAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(_moduleId, 1, "Debug Hover"));
+        return ( localize(10227, "Debug Hover"));
     }
     getAriaLabel(element) {
-        return ( localizeWithPath(
-            _moduleId,
-            2,
-            "{0}, value {1}, variables, debug",
-            element.name,
-            element.value
-        ));
+        return ( localize(10228, "{0}, value {1}, variables, debug", element.name, element.value));
     }
 }
 class DebugHoverDataSource extends AbstractExpressionDataSource {