@codingame/monaco-vscode-api 2.2.2 → 3.1.0

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

@@ -221,6 +221,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
             this.context = e.index;
             this.updateContextInput();
         });
+        this.createModesInput(container);
         this.inputContainer = $('.inputContainer');
         this.createBreakpointInput(append(container, this.inputContainer));
         this.input.getModel().setValue(this.getInputValue(this.breakpoint));
@@ -232,6 +233,25 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         this.updateContextInput();
         setTimeout(() => this.focusInput(), 150);
     }
+    createModesInput(container) {
+        const modes = this.debugService.getModel().getBreakpointModes('source');
+        if (modes.length <= 1) {
+            return;
+        }
+        const sb = this.selectModeBox = ( (new SelectBox([
+            { text: ( (localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'bpMode', 'Mode'))), isDisabled: true },
+            ...( (modes.map(mode => ({ text: mode.label, description: mode.description })))),
+        ], modes.findIndex(m => m.mode === this.breakpoint?.mode) + 1, this.contextViewService, defaultSelectBoxStyles)));
+        this.toDispose.push(sb);
+        this.toDispose.push(sb.onDidSelect(e => {
+            this.modeInput = modes[e.index - 1];
+        }));
+        const modeWrapper = $('.select-mode-container');
+        const selectionWrapper = $('.select-box-container');
+        append(modeWrapper, selectionWrapper);
+        sb.render(selectionWrapper);
+        append(container, modeWrapper);
+    }
     createTriggerBreakpointInput(container) {
         const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint);
         const index = breakpoints.findIndex((bp) => this.breakpoint?.triggeredBy === bp.getId());
@@ -395,7 +415,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     }
     centerInputVertically() {
         if (this.container && typeof this.heightInPx === 'number') {
-            const lineHeight = this.input.getOption(66 );
+            const lineHeight = this.input.getOption(67 );
             const lineNum = this.input.getModel().getLineCount();
             const newTopMargin = (this.heightInPx - lineNum * lineHeight) / 2;
             this.inputContainer.style.marginTop = newTopMargin + 'px';
@@ -403,10 +423,12 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     }
     close(success) {
         if (success) {
-            let condition = this.breakpoint && this.breakpoint.condition;
-            let hitCondition = this.breakpoint && this.breakpoint.hitCondition;
-            let logMessage = this.breakpoint && this.breakpoint.logMessage;
-            let triggeredBy = this.breakpoint && this.breakpoint.triggeredBy;
+            let condition = this.breakpoint?.condition;
+            let hitCondition = this.breakpoint?.hitCondition;
+            let logMessage = this.breakpoint?.logMessage;
+            let triggeredBy = this.breakpoint?.triggeredBy;
+            let mode = this.breakpoint?.mode;
+            let modeLabel = this.breakpoint?.modeLabel;
             this.rememberInput();
             if (this.conditionInput || this.context === 0 ) {
                 condition = this.conditionInput;
@@ -417,6 +439,10 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
             if (this.logMessageInput || this.context === 2 ) {
                 logMessage = this.logMessageInput;
             }
+            if (this.selectModeBox) {
+                mode = this.modeInput?.mode;
+                modeLabel = this.modeInput?.label;
+            }
             if (this.context === 3 ) {
                 condition = undefined;
                 hitCondition = undefined;
@@ -429,7 +455,9 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
                     condition,
                     hitCondition,
                     logMessage,
-                    triggeredBy
+                    triggeredBy,
+                    mode,
+                    modeLabel,
                 });
                 this.debugService.updateBreakpoints(this.breakpoint.originalUri, data, false).then(undefined, onUnexpectedError);
             }
@@ -443,7 +471,9 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
                             condition,
                             hitCondition,
                             logMessage,
-                            triggeredBy
+                            triggeredBy,
+                            mode,
+                            modeLabel,
                         }]);
                 }
             }

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

@@ -26,13 +26,14 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ViewPane, ViewAction } from '../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { breakpoint, dataBreakpoint, functionBreakpoint, logBreakpoint, conditionalBreakpoint, debugBreakpointUnsupported, watchExpressionsAddFuncBreakpoint, breakpointsActivate, breakpointsRemoveAll } from './debugIcons.js';
-import { CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, DEBUG_SCHEME, DebuggerString, IDebugService, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
+import { CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, DEBUG_SCHEME, DebuggerString, IDebugService, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
 import { Breakpoint, DataBreakpoint, FunctionBreakpoint, InstructionBreakpoint, ExceptionBreakpoint } from '../common/debugModel.js';
 import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
@@ -66,6 +67,7 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
         this.menu = menuService.createMenu(MenuId.DebugBreakpointsContext, contextKeyService);
         this._register(this.menu);
         this.breakpointItemType = CONTEXT_BREAKPOINT_ITEM_TYPE.bindTo(contextKeyService);
+        this.breakpointHasMultipleModes = CONTEXT_BREAKPOINT_HAS_MODES.bindTo(contextKeyService);
         this.breakpointSupportsCondition = CONTEXT_BREAKPOINT_SUPPORTS_CONDITION.bindTo(contextKeyService);
         this.breakpointInputFocused = CONTEXT_BREAKPOINT_INPUT_FOCUSED.bindTo(contextKeyService);
         this._register(this.debugService.getModel().onDidChangeBreakpoints(() => this.onBreakpointsChange()));
@@ -79,9 +81,10 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
         container.classList.add('debug-breakpoints');
         const delegate = ( new BreakpointsDelegate(this));
         this.list = this.instantiationService.createInstance(WorkbenchList, 'Breakpoints', container, delegate, [
-            this.instantiationService.createInstance(BreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
+            this.instantiationService.createInstance(BreakpointsRenderer, this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType),
             ( new ExceptionBreakpointsRenderer(
                 this.menu,
+                this.breakpointHasMultipleModes,
                 this.breakpointSupportsCondition,
                 this.breakpointItemType,
                 this.debugService
@@ -89,7 +92,7 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
             ( new ExceptionBreakpointInputRenderer(this, this.debugService, this.contextViewService)),
             this.instantiationService.createInstance(FunctionBreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
             ( new FunctionBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.labelService)),
-            this.instantiationService.createInstance(DataBreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
+            this.instantiationService.createInstance(DataBreakpointsRenderer, this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType),
             ( new DataBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.labelService)),
             this.instantiationService.createInstance(InstructionBreakpointsRenderer),
         ], {
@@ -357,8 +360,9 @@ class BreakpointsDelegate {
 const breakpointIdToActionBarDomeNode = ( new Map());
 let BreakpointsRenderer = class BreakpointsRenderer {
     static { BreakpointsRenderer_1 = this; }
-    constructor(menu, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
+    constructor(menu, breakpointHasMultipleModes, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
         this.menu = menu;
+        this.breakpointHasMultipleModes = breakpointHasMultipleModes;
         this.breakpointSupportsCondition = breakpointSupportsCondition;
         this.breakpointItemType = breakpointItemType;
         this.debugService = debugService;
@@ -383,18 +387,22 @@ let BreakpointsRenderer = class BreakpointsRenderer {
         data.filePath = append(data.breakpoint, $('span.file-path'));
         data.actionBar = ( new ActionBar(data.breakpoint));
         data.toDispose.push(data.actionBar);
-        const lineNumberContainer = append(data.breakpoint, $('.line-number-container'));
-        data.lineNumber = append(lineNumberContainer, $('span.line-number.monaco-count-badge'));
+        const badgeContainer = append(data.breakpoint, $('.badge-container'));
+        data.badge = append(badgeContainer, $('span.line-number.monaco-count-badge'));
         return data;
     }
     renderElement(breakpoint, index, data) {
         data.context = breakpoint;
         data.breakpoint.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
         data.name.textContent = basenameOrAuthority(breakpoint.uri);
-        data.lineNumber.textContent = ( breakpoint.lineNumber.toString());
+        let badgeContent = ( breakpoint.lineNumber.toString());
         if (breakpoint.column) {
-            data.lineNumber.textContent += `:${breakpoint.column}`;
+            badgeContent += `:${breakpoint.column}`;
+        }
+        if (breakpoint.modeLabel) {
+            badgeContent = `${breakpoint.modeLabel}: ${badgeContent}`;
         }
+        data.badge.textContent = badgeContent;
         data.filePath.textContent = this.labelService.getUriLabel(dirname(breakpoint.uri), { relative: true });
         data.checkbox.checked = breakpoint.enabled;
         const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
@@ -408,6 +416,7 @@ let BreakpointsRenderer = class BreakpointsRenderer {
         const session = this.debugService.getViewModel().focusedSession;
         this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
         this.breakpointItemType.set('breakpoint');
+        this.breakpointHasMultipleModes.set(this.debugService.getModel().getBreakpointModes('source').length > 1);
         createAndFillInActionBarActions(this.menu, { arg: breakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline');
         data.actionBar.clear();
         data.actionBar.push(primary, { icon: true, label: false });
@@ -418,12 +427,13 @@ let BreakpointsRenderer = class BreakpointsRenderer {
     }
 };
 BreakpointsRenderer = BreakpointsRenderer_1 = ( __decorate([
-    ( __param(3, IDebugService)),
-    ( __param(4, ILabelService))
+    ( __param(4, IDebugService)),
+    ( __param(5, ILabelService))
 ], BreakpointsRenderer));
 class ExceptionBreakpointsRenderer {
-    constructor(menu, breakpointSupportsCondition, breakpointItemType, debugService) {
+    constructor(menu, breakpointHasMultipleModes, breakpointSupportsCondition, breakpointItemType, debugService) {
         this.menu = menu;
+        this.breakpointHasMultipleModes = breakpointHasMultipleModes;
         this.breakpointSupportsCondition = breakpointSupportsCondition;
         this.breakpointItemType = breakpointItemType;
         this.debugService = debugService;
@@ -446,6 +456,8 @@ class ExceptionBreakpointsRenderer {
         data.breakpoint.classList.add('exception');
         data.actionBar = ( new ActionBar(data.breakpoint));
         data.toDispose.push(data.actionBar);
+        const badgeContainer = append(data.breakpoint, $('.badge-container'));
+        data.badge = append(badgeContainer, $('span.line-number.monaco-count-badge'));
         return data;
     }
     renderElement(exceptionBreakpoint, index, data) {
@@ -465,9 +477,17 @@ class ExceptionBreakpointsRenderer {
             "Expression condition: {0}",
             exceptionBreakpoint.condition
         ));
+        if (exceptionBreakpoint.modeLabel) {
+            data.badge.textContent = exceptionBreakpoint.modeLabel;
+            data.badge.style.display = 'block';
+        }
+        else {
+            data.badge.style.display = 'none';
+        }
         const primary = [];
         this.breakpointSupportsCondition.set(exceptionBreakpoint.supportsCondition);
         this.breakpointItemType.set('exceptionBreakpoint');
+        this.breakpointHasMultipleModes.set(this.debugService.getModel().getBreakpointModes('exception').length > 1);
         createAndFillInActionBarActions(this.menu, { arg: exceptionBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline');
         data.actionBar.clear();
         data.actionBar.push(primary, { icon: true, label: false });
@@ -505,6 +525,8 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
         data.condition = append(data.breakpoint, $('span.condition'));
         data.actionBar = ( new ActionBar(data.breakpoint));
         data.toDispose.push(data.actionBar);
+        const badgeContainer = append(data.breakpoint, $('.badge-container'));
+        data.badge = append(badgeContainer, $('span.line-number.monaco-count-badge'));
         return data;
     }
     renderElement(functionBreakpoint, _index, data) {
@@ -527,6 +549,13 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
         else {
             data.condition.textContent = functionBreakpoint.condition || functionBreakpoint.hitCondition || '';
         }
+        if (functionBreakpoint.modeLabel) {
+            data.badge.textContent = functionBreakpoint.modeLabel;
+            data.badge.style.display = 'block';
+        }
+        else {
+            data.badge.style.display = 'none';
+        }
         const session = this.debugService.getViewModel().focusedSession;
         data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsFunctionBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
         if (session && !session.capabilities.supportsFunctionBreakpoints) {
@@ -554,8 +583,9 @@ FunctionBreakpointsRenderer = FunctionBreakpointsRenderer_1 = ( __decorate([
 ], FunctionBreakpointsRenderer));
 let DataBreakpointsRenderer = class DataBreakpointsRenderer {
     static { DataBreakpointsRenderer_1 = this; }
-    constructor(menu, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
+    constructor(menu, breakpointHasMultipleModes, breakpointSupportsCondition, breakpointItemType, debugService, labelService) {
         this.menu = menu;
+        this.breakpointHasMultipleModes = breakpointHasMultipleModes;
         this.breakpointSupportsCondition = breakpointSupportsCondition;
         this.breakpointItemType = breakpointItemType;
         this.debugService = debugService;
@@ -581,6 +611,8 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         data.condition = append(data.breakpoint, $('span.condition'));
         data.actionBar = ( new ActionBar(data.breakpoint));
         data.toDispose.push(data.actionBar);
+        const badgeContainer = append(data.breakpoint, $('.badge-container'));
+        data.badge = append(badgeContainer, $('span.line-number.monaco-count-badge'));
         return data;
     }
     renderElement(dataBreakpoint, _index, data) {
@@ -591,6 +623,13 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         data.icon.title = message ? message : '';
         data.checkbox.checked = dataBreakpoint.enabled;
         data.breakpoint.title = message ? message : '';
+        if (dataBreakpoint.modeLabel) {
+            data.badge.textContent = dataBreakpoint.modeLabel;
+            data.badge.style.display = 'block';
+        }
+        else {
+            data.badge.style.display = 'none';
+        }
         const session = this.debugService.getViewModel().focusedSession;
         data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsDataBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
         if (session && !session.capabilities.supportsDataBreakpoints) {
@@ -621,6 +660,7 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         }
         const primary = [];
         this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
+        this.breakpointHasMultipleModes.set(this.debugService.getModel().getBreakpointModes('data').length > 1);
         this.breakpointItemType.set('dataBreakpoint');
         createAndFillInActionBarActions(this.menu, { arg: dataBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline');
         data.actionBar.clear();
@@ -632,8 +672,8 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
     }
 };
 DataBreakpointsRenderer = DataBreakpointsRenderer_1 = ( __decorate([
-    ( __param(3, IDebugService)),
-    ( __param(4, ILabelService))
+    ( __param(4, IDebugService)),
+    ( __param(5, ILabelService))
 ], DataBreakpointsRenderer));
 let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
     static { InstructionBreakpointsRenderer_1 = this; }
@@ -660,6 +700,8 @@ let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
         data.address = append(data.breakpoint, $('span.file-path'));
         data.actionBar = ( new ActionBar(data.breakpoint));
         data.toDispose.push(data.actionBar);
+        const badgeContainer = append(data.breakpoint, $('.badge-container'));
+        data.badge = append(badgeContainer, $('span.line-number.monaco-count-badge'));
         return data;
     }
     renderElement(breakpoint, index, data) {
@@ -675,6 +717,13 @@ let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
         if (debugActive && !breakpoint.verified) {
             data.breakpoint.classList.add('disabled');
         }
+        if (breakpoint.modeLabel) {
+            data.badge.textContent = breakpoint.modeLabel;
+            data.badge.style.display = 'block';
+        }
+        else {
+            data.badge.style.display = 'none';
+        }
     }
     disposeTemplate(templateData) {
         dispose(templateData.toDispose);
@@ -1260,17 +1309,16 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.debug.viewlet.action.addFunctionBreakpointAction',
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     'addFunctionBreakpoint',
                     "Add Function Breakpoint"
                 )),
-                original: 'Add Function Breakpoint',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     { key: 'miFunctionBreakpoint', comment: ['&& denotes a mnemonic'] },
                     "&&Function Breakpoint..."
-                ))
+                )),
             },
             f1: true,
             icon: watchExpressionsAddFuncBreakpoint,
@@ -1360,8 +1408,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.debug.viewlet.action.removeAllBreakpoints',
             title: {
-                original: 'Remove All Breakpoints',
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     'removeAllBreakpoints',
                     "Remove All Breakpoints"
@@ -1370,7 +1417,7 @@ registerAction2(class extends Action2 {
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     { key: 'miRemoveAllBreakpoints', comment: ['&& denotes a mnemonic'] },
                     "Remove &&All Breakpoints"
-                ))
+                )),
             },
             f1: true,
             icon: breakpointsRemoveAll,
@@ -1405,8 +1452,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.debug.viewlet.action.enableAllBreakpoints',
             title: {
-                original: 'Enable All Breakpoints',
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     'enableAllBreakpoints',
                     "Enable All Breakpoints"
@@ -1442,8 +1488,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.debug.viewlet.action.disableAllBreakpoints',
             title: {
-                original: 'Disable All Breakpoints',
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     'disableAllBreakpoints',
                     "Disable All Breakpoints"
@@ -1452,7 +1497,7 @@ registerAction2(class extends Action2 {
                     'vs/workbench/contrib/debug/browser/breakpointsView',
                     { key: 'miDisableAllBreakpoints', comment: ['&& denotes a mnemonic'] },
                     "Disable A&&ll Breakpoints"
-                ))
+                )),
             },
             f1: true,
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -1605,4 +1650,52 @@ registerAction2(class extends ViewAction {
         view.renderInputBox({ breakpoint, type: 'hitCount' });
     }
 });
+registerAction2(class extends ViewAction {
+    constructor() {
+        super({
+            id: 'debug.editBreakpointMode',
+            viewId: BREAKPOINTS_VIEW_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'editMode',
+                "Edit Mode..."
+            )),
+            menu: [{
+                    id: MenuId.DebugBreakpointsContext,
+                    group: 'navigation',
+                    order: 20,
+                    when: ( ContextKeyExpr.and(CONTEXT_BREAKPOINT_HAS_MODES, ( ContextKeyExpr.or(( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('breakpoint')), ( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('exceptionBreakpoint')), ( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('instructionBreakpoint'))))))
+                }]
+        });
+    }
+    async runInView(accessor, view, breakpoint) {
+        const kind = breakpoint instanceof Breakpoint ? 'source' : breakpoint instanceof InstructionBreakpoint ? 'instruction' : 'exception';
+        const debugService = accessor.get(IDebugService);
+        const modes = debugService.getModel().getBreakpointModes(kind);
+        const picked = await accessor.get(IQuickInputService).pick(( modes.map(
+            mode => ({ label: mode.label, description: mode.description, mode: mode.mode })
+        )), { placeHolder: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/breakpointsView',
+            'selectBreakpointMode',
+            "Select Breakpoint Mode"
+        )) });
+        if (!picked) {
+            return;
+        }
+        if (kind === 'source') {
+            const data = ( new Map());
+            data.set(breakpoint.getId(), { mode: picked.mode, modeLabel: picked.label });
+            debugService.updateBreakpoints(breakpoint.originalUri, data, false);
+        }
+        else if (breakpoint instanceof InstructionBreakpoint) {
+            debugService.removeInstructionBreakpoints(breakpoint.instructionReference, breakpoint.offset);
+            debugService.addInstructionBreakpoint({ ...breakpoint.toJSON(), mode: picked.mode, modeLabel: picked.label });
+        }
+        else if (breakpoint instanceof ExceptionBreakpoint) {
+            breakpoint.mode = picked.mode;
+            breakpoint.modeLabel = picked.label;
+            debugService.setExceptionBreakpointCondition(breakpoint, breakpoint.condition);
+        }
+    }
+});
 export { BreakpointsView, getBreakpointMessageAndIcon, getExpandedBodySize, openBreakpointSource };

package/vscode/src/vs/workbench/contrib/debug/browser/media/all.png.js

@@ -0,0 +1,11 @@
+var pngAssets = {
+  'vs/workbench/contrib/debug/browser/media/continue-tb.png': new URL('../../../../../../../../assets/continue-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/pause-tb.png': new URL('../../../../../../../../assets/pause-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/restart-tb.png': new URL('../../../../../../../../assets/restart-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/run-with-debugging-tb.png': new URL('../../../../../../../../assets/run-with-debugging-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stepinto-tb.png': new URL('../../../../../../../../assets/stepinto-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stepout-tb.png': new URL('../../../../../../../../assets/stepout-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stepover-tb.png': new URL('../../../../../../../../assets/stepover-tb.png', import.meta.url).href,
+  'vs/workbench/contrib/debug/browser/media/stop-tb.png': new URL('../../../../../../../../assets/stop-tb.png', import.meta.url).href
+};
+export { pngAssets as default };

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .zone-widget .zone-widget-container.breakpoint-widget{border-color:#007acc;display:flex}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container{display:flex;flex-direction:column;flex-shrink:0;justify-content:center;padding:0 10px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .monaco-select-box{min-height:18px;min-width:100px;padding:2px 20px 2px 8px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container:after{right:14px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputContainer{flex:1}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container{align-items:center;display:flex;flex-grow:1;gap:10px;width:0}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container .monaco-button{flex-grow:0;line-height:14px;padding-left:8px;padding-right:8px;width:auto}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container .select-box-container{display:flex;flex-direction:column;justify-content:center;width:300px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container:after{right:14px}";
+var css = ".monaco-editor .zone-widget .zone-widget-container.breakpoint-widget{border-color:#007acc;display:flex;.breakpoint-select-container{display:flex;flex-direction:column;flex-shrink:0;justify-content:center;padding:0 10px}.monaco-select-box{min-height:18px;min-width:100px;padding:2px 20px 2px 8px}.breakpoint-select-container:after{right:14px}.inputContainer{flex:1}.select-breakpoint-container{align-items:center;display:flex;flex-grow:1;gap:10px;width:0}.select-breakpoint-container .monaco-button{flex-grow:0;line-height:14px;padding-left:8px;padding-right:8px;width:auto}.select-breakpoint-container .select-box-container,.select-mode-container{display:flex;flex-direction:column;justify-content:center;width:300px}.select-breakpoint-container .select-box-container{width:300px}.select-mode-container .select-box-container{margin-right:10px;width:100px}.select-breakpoint-container:after{right:14px}}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts

@@ -16,6 +16,7 @@ import { ITelemetryEndpoint } from '../../../../platform/telemetry/common/teleme
 import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
 import { IEditorPane } from '../../../common/editor.js';
 import { DebugCompoundRoot } from './debugCompoundRoot.js';
+import { IInstructionBreakpointOptions } from './debugModel.js';
 import { Source } from './debugSource.js';
 import { ITaskIdentifier } from '../../tasks/common/tasks.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -365,6 +366,8 @@ interface IBreakpointData {
     readonly logMessage?: string;
     readonly hitCondition?: string;
     readonly triggeredBy?: string;
+    readonly mode?: string;
+    readonly modeLabel?: string;
 }
 interface IBreakpointUpdateData {
     readonly condition?: string;
@@ -373,6 +376,8 @@ interface IBreakpointUpdateData {
     readonly lineNumber?: number;
     readonly column?: number;
     readonly triggeredBy?: string;
+    readonly mode?: string;
+    readonly modeLabel?: string;
 }
 interface IBaseBreakpoint extends IEnablement {
     readonly condition?: string;
@@ -381,6 +386,10 @@ interface IBaseBreakpoint extends IEnablement {
     readonly verified: boolean;
     readonly supported: boolean;
     readonly message?: string;
+    /** The preferred mode of the breakpoint from {@link DebugProtocol.BreakpointMode} */
+    readonly mode?: string;
+    /** The preferred mode label of the breakpoint from {@link DebugProtocol.BreakpointMode} */
+    readonly modeLabel?: string;
     readonly sessionsThatVerified: string[];
     getIdFromAdapter(sessionId: string): number | undefined;
 }
@@ -406,9 +415,11 @@ interface IBreakpoint extends IBaseBreakpoint {
     setSessionDidTrigger(sessionId: string): void;
     /** Gets whether the `triggeredBy` condition has been met in the given sesison ID. */
     getSessionDidTrigger(sessionId: string): boolean;
+    toDAP(): DebugProtocol.SourceBreakpoint;
 }
 interface IFunctionBreakpoint extends IBaseBreakpoint {
     readonly name: string;
+    toDAP(): DebugProtocol.FunctionBreakpoint;
 }
 interface IExceptionBreakpoint extends IBaseBreakpoint {
     readonly filter: string;
@@ -420,13 +431,14 @@ interface IDataBreakpoint extends IBaseBreakpoint {
     readonly dataId: string;
     readonly canPersist: boolean;
     readonly accessType: DebugProtocol.DataBreakpointAccessType;
+    toDAP(): DebugProtocol.DataBreakpoint;
 }
 interface IInstructionBreakpoint extends IBaseBreakpoint {
     readonly instructionReference: string;
     readonly offset?: number;
     /** Original instruction memory address; display purposes only */
     readonly address: bigint;
-    toJSON(): DebugProtocol.InstructionBreakpoint;
+    toDAP(): DebugProtocol.InstructionBreakpoint;
 }
 interface IExceptionInfo {
     readonly id?: string;
@@ -447,6 +459,11 @@ interface IViewModel extends ITreeElement {
      * Returns the focused stack frame or undefined if there are no stack frames.
      */
     readonly focusedStackFrame: IStackFrame | undefined;
+    setVisualizedExpression(original: IExpression, visualized: IExpression & {
+        treeId: string;
+    } | undefined): void;
+    /** Returns the visualized expression if loaded, or a tree it should be visualized with, or undefined */
+    getVisualizedExpression(expression: IExpression): IExpression | string | undefined;
     getSelectedExpression(): {
         expression: IExpression;
         settingWatch: boolean;
@@ -470,6 +487,14 @@ interface IViewModel extends ITreeElement {
         settingWatch: boolean;
     } | undefined>;
     onDidEvaluateLazyExpression: Event<IExpressionContainer>;
+    /**
+     * Fired when `setVisualizedExpression`, to migrate elements currently
+     * rendered as `original` to the `replacement`.
+     */
+    onDidChangeVisualization: Event<{
+        original: IExpression;
+        replacement: IExpression;
+    }>;
     onWillUpdateViews: Event<void>;
     evaluateLazyExpression(expression: IExpressionContainer): void;
 }
@@ -501,6 +526,8 @@ interface IDebugModel extends ITreeElement {
     getExceptionBreakpointsForSession(sessionId?: string): ReadonlyArray<IExceptionBreakpoint>;
     getInstructionBreakpoints(): ReadonlyArray<IInstructionBreakpoint>;
     getWatchExpressions(): ReadonlyArray<IExpression & IEvaluate>;
+    registerBreakpointModes(debugType: string, modes: DebugProtocol.BreakpointMode[]): void;
+    getBreakpointModes(forBreakpointType: 'source' | 'exception' | 'data' | 'instruction'): DebugProtocol.BreakpointMode[];
     onDidChangeBreakpoints: Event<IBreakpointsChangeEvent | undefined>;
     onDidChangeCallStack: Event<void>;
     onDidChangeWatchExpressions: Event<IExpression | undefined>;
@@ -813,7 +840,7 @@ interface IDebugService {
     /**
      * Adds a new function breakpoint for the given name.
      */
-    addFunctionBreakpoint(name?: string, id?: string): void;
+    addFunctionBreakpoint(name?: string, id?: string, mode?: string): void;
     /**
      * Updates an already existing function breakpoint.
      * Notifies debug adapter of breakpoint changes.
@@ -831,7 +858,7 @@ interface IDebugService {
     /**
      * Adds a new data breakpoint.
      */
-    addDataBreakpoint(label: string, dataId: string, canPersist: boolean, accessTypes: DebugProtocol.DataBreakpointAccessType[] | undefined, accessType: DebugProtocol.DataBreakpointAccessType): Promise<void>;
+    addDataBreakpoint(label: string, dataId: string, canPersist: boolean, accessTypes: DebugProtocol.DataBreakpointAccessType[] | undefined, accessType: DebugProtocol.DataBreakpointAccessType, mode: string | undefined): Promise<void>;
     /**
      * Updates an already existing data breakpoint.
      * Notifies debug adapter of breakpoint changes.
@@ -848,7 +875,7 @@ interface IDebugService {
     /**
      * Adds a new instruction breakpoint.
      */
-    addInstructionBreakpoint(instructionReference: string, offset: number, address: bigint, condition?: string, hitCondition?: string): Promise<void>;
+    addInstructionBreakpoint(opts: IInstructionBreakpointOptions): Promise<void>;
     /**
      * Removes all instruction breakpoints. If address is passed only removes the instruction breakpoint with the passed address.
      * The address should be the address string supplied by the debugger from the "Disassemble" request.
@@ -856,7 +883,12 @@ interface IDebugService {
      */
     removeInstructionBreakpoints(instructionReference?: string, offset?: number): Promise<void>;
     setExceptionBreakpointCondition(breakpoint: IExceptionBreakpoint, condition: string | undefined): Promise<void>;
-    setExceptionBreakpointsForSession(session: IDebugSession, data: DebugProtocol.ExceptionBreakpointsFilter[]): void;
+    /**
+     * Creates breakpoints based on the sesison filter options. This will create
+     * disabled breakpoints (or enabled, if the filter indicates it's a default)
+     * for each filter provided in the session.
+     */
+    setExceptionBreakpointsForSession(session: IDebugSession, filters: DebugProtocol.ExceptionBreakpointsFilter[]): void;
     /**
      * Sends all breakpoints to the passed session.
      * If session is not passed, sends all breakpoints to each session.