Skip to content

debug: default triggered breakpoint picker to first breakpoint #313453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connor4312 merged 4 commits into from
Apr 30, 2026
+13 −5
Merged

debug: default triggered breakpoint picker to first breakpoint #313453

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70b4dac
debug: default triggered breakpoint picker to first breakpoint
iideprived Apr 30, 2026
fc1aae4
Merge branch 'main' into fix-triggered-breakpoint-default
iideprived Apr 30, 2026
9f8268f
Merge branch 'main' into fix-triggered-breakpoint-default
iideprived Apr 30, 2026
67155e6
Merge branch 'main' into fix-triggered-breakpoint-default
iideprived Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,21 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
this.availableBreakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint && !bp.logMessage);
const breakpointOptions = this.buildBreakpointOptions();

const index = this.availableBreakpoints.findIndex((bp) => this.breakpoint?.triggeredBy === bp.getId());
const index = this.availableBreakpoints.findIndex(bp => this.breakpoint?.triggeredBy === bp.getId());

let selectedIndex = 0;

if (index !== -1) {
this.triggeredByBreakpointInput = this.availableBreakpoints[index];
selectedIndex = index + 1;
} else if (!this.breakpoint?.triggeredBy && this.availableBreakpoints.length > 0) {
this.triggeredByBreakpointInput = this.availableBreakpoints[0];
selectedIndex = 1;
} else {
this.triggeredByBreakpointInput = undefined;
}

const selectBreakpointBox = this.selectBreakpointBox = this.store.add(new SelectBox(breakpointOptions, index + 1, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('selectBreakpoint', 'Select breakpoint'), useCustomDrawn: !hasNativeContextMenu(this._configurationService) }));
const selectBreakpointBox = this.selectBreakpointBox = this.store.add(new SelectBox(breakpointOptions, selectedIndex, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('selectBreakpoint', 'Select breakpoint'), useCustomDrawn: !hasNativeContextMenu(this._configurationService) }));
this.store.add(selectBreakpointBox.onDidSelect(e => {
if (e.index === 0) {
this.triggeredByBreakpointInput = undefined;
Expand Down Expand Up @@ -337,14 +346,13 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
private updateTriggerBreakpointList(): void {
this.availableBreakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint && !bp.logMessage);

// Try to preserve the current selection if the breakpoint still exists
let selectedIndex = 0; // Default to "None"
let selectedIndex = 0;

if (this.triggeredByBreakpointInput) {
const newIndex = this.availableBreakpoints.findIndex(bp => bp.getId() === this.triggeredByBreakpointInput?.getId());
if (newIndex !== -1) {
selectedIndex = newIndex + 1;
} else {
// The selected breakpoint was removed, clear the selection
this.triggeredByBreakpointInput = undefined;
}
}
Expand Down
Loading