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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "1.83.2",
+  "version": "1.83.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.3",
     "monaco-editor": "0.44.0"
   }
 }

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

@@ -8,7 +8,7 @@ import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
 import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { DisposableStore, dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
 import { defaultInputBoxStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -104,7 +104,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const name = dom.append(expression, $('span.name'));
         const lazyButton = dom.append(expression, $('span.lazy-button'));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
-        lazyButton.title = ( localize('debug.lazyButton.tooltip', "Click to expand"));
+        lazyButton.title = localizeWithPath('vs/workbench/contrib/debug/browser/baseDebugView', 'debug.lazyButton.tooltip', "Click to expand");
         const value = dom.append(expression, $('span.value'));
         const label = ( new HighlightedLabel(name));
         const inputBoxContainer = dom.append(expression, $('.inputBoxContainer'));

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

@@ -236,33 +236,19 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
                     }
                     else if (!platform.isLinux && ( breakpoints.some(bp => !!bp.condition || !!bp.logMessage || !!bp.hitCondition))) {
                         const logPoint = breakpoints.every(bp => !!bp.logMessage);
-                        const breakpointType = logPoint ? ( nls.localize('logPoint', "Logpoint")) : ( nls.localize('breakpoint', "Breakpoint"));
-                        const disabledBreakpointDialogMessage = ( nls.localize(
-                            'breakpointHasConditionDisabled',
-                            "This {0} has a {1} that will get lost on remove. Consider enabling the {0} instead.",
-                            breakpointType.toLowerCase(),
-                            logPoint ? ( nls.localize('message', "message")) : ( nls.localize('condition', "condition"))
-                        ));
-                        const enabledBreakpointDialogMessage = ( nls.localize(
-                            'breakpointHasConditionEnabled',
-                            "This {0} has a {1} that will get lost on remove. Consider disabling the {0} instead.",
-                            breakpointType.toLowerCase(),
-                            logPoint ? ( nls.localize('message', "message")) : ( nls.localize('condition', "condition"))
-                        ));
+                        const breakpointType = logPoint ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'logPoint', "Logpoint") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'breakpoint', "Breakpoint");
+                        const disabledBreakpointDialogMessage = nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'breakpointHasConditionDisabled', "This {0} has a {1} that will get lost on remove. Consider enabling the {0} instead.", breakpointType.toLowerCase(), logPoint ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'message', "message") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'condition', "condition"));
+                        const enabledBreakpointDialogMessage = nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'breakpointHasConditionEnabled', "This {0} has a {1} that will get lost on remove. Consider disabling the {0} instead.", breakpointType.toLowerCase(), logPoint ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'message', "message") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'condition', "condition"));
                         await this.dialogService.prompt({
                             type: Severity.Info,
                             message: enabled ? enabledBreakpointDialogMessage : disabledBreakpointDialogMessage,
                             buttons: [
                                 {
-                                    label: ( nls.localize(
-                                        { key: 'removeLogPoint', comment: ['&& denotes a mnemonic'] },
-                                        "&&Remove {0}",
-                                        breakpointType
-                                    )),
+                                    label: nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', { key: 'removeLogPoint', comment: ['&& denotes a mnemonic'] }, "&&Remove {0}", breakpointType),
                                     run: () => breakpoints.forEach(bp => this.debugService.removeBreakpoints(bp.getId()))
                                 },
                                 {
-                                    label: ( nls.localize('disableLogPoint', "{0} {1}", enabled ? ( nls.localize({ key: 'disable', comment: ['&& denotes a mnemonic'] }, "&&Disable")) : ( nls.localize({ key: 'enable', comment: ['&& denotes a mnemonic'] }, "&&Enable")), breakpointType)),
+                                    label: nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'disableLogPoint', "{0} {1}", enabled ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', { key: 'disable', comment: ['&& denotes a mnemonic'] }, "&&Disable") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', { key: 'enable', comment: ['&& denotes a mnemonic'] }, "&&Enable"), breakpointType),
                                     run: () => breakpoints.forEach(bp => this.debugService.enableOrDisableBreakpoints(!enabled, bp))
                                 }
                             ],
@@ -327,14 +313,26 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
     getContextMenuActions(breakpoints, uri, lineNumber, column) {
         const actions = [];
         if (breakpoints.length === 1) {
-            const breakpointType = breakpoints[0].logMessage ? ( nls.localize('logPoint', "Logpoint")) : ( nls.localize('breakpoint', "Breakpoint"));
-            actions.push(( new Action('debug.removeBreakpoint', ( nls.localize('removeBreakpoint', "Remove {0}", breakpointType)), undefined, true, async () => {
-                await this.debugService.removeBreakpoints(breakpoints[0].getId());
-            })));
-            actions.push(( new Action('workbench.debug.action.editBreakpointAction', ( nls.localize('editBreakpoint', "Edit {0}...", breakpointType)), undefined, true, () => Promise.resolve(this.showBreakpointWidget(breakpoints[0].lineNumber, breakpoints[0].column)))));
+            const breakpointType = breakpoints[0].logMessage ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'logPoint', "Logpoint") : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'breakpoint', "Breakpoint");
+            actions.push(( new Action(
+                'debug.removeBreakpoint',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'removeBreakpoint', "Remove {0}", breakpointType),
+                undefined,
+                true,
+                async () => {
+                    await this.debugService.removeBreakpoints(breakpoints[0].getId());
+                }
+            )));
+            actions.push(( new Action(
+                'workbench.debug.action.editBreakpointAction',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'editBreakpoint', "Edit {0}...", breakpointType),
+                undefined,
+                true,
+                () => Promise.resolve(this.showBreakpointWidget(breakpoints[0].lineNumber, breakpoints[0].column))
+            )));
             actions.push(( new Action(
                 `workbench.debug.viewlet.action.toggleBreakpoint`,
-                breakpoints[0].enabled ? ( nls.localize('disableBreakpoint', "Disable {0}", breakpointType)) : ( nls.localize('enableBreakpoint', "Enable {0}", breakpointType)),
+                breakpoints[0].enabled ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'disableBreakpoint', "Disable {0}", breakpointType) : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'enableBreakpoint', "Enable {0}", breakpointType),
                 undefined,
                 true,
                 () => this.debugService.enableOrDisableBreakpoints(!breakpoints[0].enabled, breakpoints[0])
@@ -342,37 +340,73 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
         }
         else if (breakpoints.length > 1) {
             const sorted = breakpoints.slice().sort((first, second) => (first.column && second.column) ? first.column - second.column : 1);
-            actions.push(( new SubmenuAction('debug.removeBreakpoints', ( nls.localize('removeBreakpoints', "Remove Breakpoints")), ( sorted.map(bp => ( new Action('removeInlineBreakpoint', bp.column ? ( nls.localize(
-                'removeInlineBreakpointOnColumn',
-                "Remove Inline Breakpoint on Column {0}",
-                bp.column
-            )) : ( nls.localize('removeLineBreakpoint', "Remove Line Breakpoint")), undefined, true, () => this.debugService.removeBreakpoints(bp.getId()))))))));
-            actions.push(( new SubmenuAction('debug.editBreakpoints', ( nls.localize('editBreakpoints', "Edit Breakpoints")), ( sorted.map(bp => ( new Action('editBreakpoint', bp.column ? ( nls.localize(
-                'editInlineBreakpointOnColumn',
-                "Edit Inline Breakpoint on Column {0}",
-                bp.column
-            )) : ( nls.localize('editLineBreakpoint', "Edit Line Breakpoint")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(bp.lineNumber, bp.column)))))))));
-            actions.push(( new SubmenuAction('debug.enableDisableBreakpoints', ( nls.localize('enableDisableBreakpoints', "Enable/Disable Breakpoints")), ( sorted.map(bp => ( new Action(
-                bp.enabled ? 'disableColumnBreakpoint' : 'enableColumnBreakpoint',
-                bp.enabled ? (bp.column ? ( nls.localize(
-                    'disableInlineColumnBreakpoint',
-                    "Disable Inline Breakpoint on Column {0}",
-                    bp.column
-                )) : ( nls.localize('disableBreakpointOnLine', "Disable Line Breakpoint")))
-                    : (bp.column ? ( nls.localize('enableBreakpoints', "Enable Inline Breakpoint on Column {0}", bp.column)) : ( nls.localize('enableBreakpointOnLine', "Enable Line Breakpoint"))),
-                undefined,
-                true,
-                () => this.debugService.enableOrDisableBreakpoints(!bp.enabled, bp)
-            )))))));
+            actions.push(( new SubmenuAction(
+                'debug.removeBreakpoints',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'removeBreakpoints', "Remove Breakpoints"),
+                ( sorted.map(bp => ( new Action(
+                    'removeInlineBreakpoint',
+                    bp.column ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'removeInlineBreakpointOnColumn', "Remove Inline Breakpoint on Column {0}", bp.column) : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'removeLineBreakpoint', "Remove Line Breakpoint"),
+                    undefined,
+                    true,
+                    () => this.debugService.removeBreakpoints(bp.getId())
+                ))))
+            )));
+            actions.push(( new SubmenuAction(
+                'debug.editBreakpoints',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'editBreakpoints', "Edit Breakpoints"),
+                ( sorted.map(bp => ( new Action(
+                    'editBreakpoint',
+                    bp.column ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'editInlineBreakpointOnColumn', "Edit Inline Breakpoint on Column {0}", bp.column) : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'editLineBreakpoint', "Edit Line Breakpoint"),
+                    undefined,
+                    true,
+                    () => Promise.resolve(this.showBreakpointWidget(bp.lineNumber, bp.column))
+                ))))
+            )));
+            actions.push(( new SubmenuAction(
+                'debug.enableDisableBreakpoints',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'enableDisableBreakpoints', "Enable/Disable Breakpoints"),
+                ( sorted.map(bp => ( new Action(
+                    bp.enabled ? 'disableColumnBreakpoint' : 'enableColumnBreakpoint',
+                    bp.enabled ? (bp.column ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'disableInlineColumnBreakpoint', "Disable Inline Breakpoint on Column {0}", bp.column) : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'disableBreakpointOnLine', "Disable Line Breakpoint"))
+                        : (bp.column ? nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'enableBreakpoints', "Enable Inline Breakpoint on Column {0}", bp.column) : nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'enableBreakpointOnLine', "Enable Line Breakpoint")),
+                    undefined,
+                    true,
+                    () => this.debugService.enableOrDisableBreakpoints(!bp.enabled, bp)
+                ))))
+            )));
         }
         else {
-            actions.push(( new Action('addBreakpoint', ( nls.localize('addBreakpoint', "Add Breakpoint")), undefined, true, () => this.debugService.addBreakpoints(uri, [{ lineNumber, column }]))));
-            actions.push(( new Action('addConditionalBreakpoint', ( nls.localize('addConditionalBreakpoint', "Add Conditional Breakpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 0 )))));
-            actions.push(( new Action('addLogPoint', ( nls.localize('addLogPoint', "Add Logpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 2 )))));
+            actions.push(( new Action(
+                'addBreakpoint',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'addBreakpoint', "Add Breakpoint"),
+                undefined,
+                true,
+                () => this.debugService.addBreakpoints(uri, [{ lineNumber, column }])
+            )));
+            actions.push(( new Action(
+                'addConditionalBreakpoint',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'addConditionalBreakpoint', "Add Conditional Breakpoint..."),
+                undefined,
+                true,
+                () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 0 ))
+            )));
+            actions.push(( new Action(
+                'addLogPoint',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'addLogPoint', "Add Logpoint..."),
+                undefined,
+                true,
+                () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 2 ))
+            )));
         }
         if (this.debugService.state === 2 ) {
             actions.push(( new Separator()));
-            actions.push(( new Action('runToLine', ( nls.localize('runToLine', "Run to Line")), undefined, true, () => this.debugService.runTo(uri, lineNumber).catch(onUnexpectedError))));
+            actions.push(( new Action(
+                'runToLine',
+                nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'runToLine', "Run to Line"),
+                undefined,
+                true,
+                () => this.debugService.runTo(uri, lineNumber).catch(onUnexpectedError)
+            )));
         }
         return actions;
     }
@@ -707,22 +741,10 @@ registerThemingParticipant((theme, collector) => {
 		`);
     }
 });
-const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hcDark: '#E51400', hcLight: '#E51400' }, ( nls.localize('debugIcon.breakpointForeground', 'Icon color for breakpoints.')));
-const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, ( nls.localize(
-    'debugIcon.breakpointDisabledForeground',
-    'Icon color for disabled breakpoints.'
-)));
-const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, ( nls.localize(
-    'debugIcon.breakpointUnverifiedForeground',
-    'Icon color for unverified breakpoints.'
-)));
-const debugIconBreakpointCurrentStackframeForeground = registerColor('debugIcon.breakpointCurrentStackframeForeground', { dark: '#FFCC00', light: '#BE8700', hcDark: '#FFCC00', hcLight: '#BE8700' }, ( nls.localize(
-    'debugIcon.breakpointCurrentStackframeForeground',
-    'Icon color for the current breakpoint stack frame.'
-)));
-const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', { dark: '#89D185', light: '#89D185', hcDark: '#89D185', hcLight: '#89D185' }, ( nls.localize(
-    'debugIcon.breakpointStackframeForeground',
-    'Icon color for all breakpoint stack frames.'
-)));
+const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hcDark: '#E51400', hcLight: '#E51400' }, nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'debugIcon.breakpointForeground', 'Icon color for breakpoints.'));
+const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'debugIcon.breakpointDisabledForeground', 'Icon color for disabled breakpoints.'));
+const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'debugIcon.breakpointUnverifiedForeground', 'Icon color for unverified breakpoints.'));
+const debugIconBreakpointCurrentStackframeForeground = registerColor('debugIcon.breakpointCurrentStackframeForeground', { dark: '#FFCC00', light: '#BE8700', hcDark: '#FFCC00', hcLight: '#BE8700' }, nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'debugIcon.breakpointCurrentStackframeForeground', 'Icon color for the current breakpoint stack frame.'));
+const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', { dark: '#89D185', light: '#89D185', hcDark: '#89D185', hcLight: '#89D185' }, nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointEditorContribution', 'debugIcon.breakpointStackframeForeground', 'Icon color for all breakpoint stack frames.'));
 
 export { BreakpointEditorContribution, createBreakpointDecorations, debugIconBreakpointForeground };

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

@@ -108,32 +108,11 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         const closeString = this.keybindingService.lookupKeybinding(CloseBreakpointWidgetCommand.ID)?.getLabel() || 'Escape';
         switch (this.context) {
             case 2 :
-                return (
-                     (nls.localize(
-                        'breakpointWidgetLogMessagePlaceholder',
-                        "Message to log when breakpoint is hit. Expressions within {} are interpolated. '{0}' to accept, '{1}' to cancel.",
-                        acceptString,
-                        closeString
-                    ))
-                );
+                return nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'breakpointWidgetLogMessagePlaceholder', "Message to log when breakpoint is hit. Expressions within {} are interpolated. '{0}' to accept, '{1}' to cancel.", acceptString, closeString);
             case 1 :
-                return (
-                     (nls.localize(
-                        'breakpointWidgetHitCountPlaceholder',
-                        "Break when hit count condition is met. '{0}' to accept, '{1}' to cancel.",
-                        acceptString,
-                        closeString
-                    ))
-                );
+                return nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'breakpointWidgetHitCountPlaceholder', "Break when hit count condition is met. '{0}' to accept, '{1}' to cancel.", acceptString, closeString);
             default:
-                return (
-                     (nls.localize(
-                        'breakpointWidgetExpressionPlaceholder',
-                        "Break when expression evaluates to true. '{0}' to accept, '{1}' to cancel.",
-                        acceptString,
-                        closeString
-                    ))
-                );
+                return nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'breakpointWidgetExpressionPlaceholder', "Break when expression evaluates to true. '{0}' to accept, '{1}' to cancel.", acceptString, closeString);
         }
     }
     getInputValue(breakpoint) {
@@ -176,11 +155,11 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     _fillContainer(container) {
         this.setCssClass('breakpoint-widget');
         const selectBox = ( (new SelectBox(
-            [{ text: ( (nls.localize('expression', "Expression"))) }, { text: ( (nls.localize('hitCount', "Hit Count"))) }, { text: ( (nls.localize('logMessage', "Log Message"))) }],
+            [{ text: nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'expression', "Expression") }, { text: nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'hitCount', "Hit Count") }, { text: nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'logMessage', "Log Message") }],
             this.context,
             this.contextViewService,
             defaultSelectBoxStyles,
-            { ariaLabel: ( (nls.localize('breakpointType', 'Breakpoint Type'))) }
+            { ariaLabel: nls.localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'breakpointType', 'Breakpoint Type') }
         )));
         this.selectContainer = $('.breakpoint-select-container');
         selectBox.render(dom.append(container, this.selectContainer));