Skip to content

Issue 163528/create edit breakpoint command #163734

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
roblourens merged 4 commits into from
Dec 31, 2022
Merged

Issue 163528/create edit breakpoint command #163734

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54be1e3
Merge branch 'microsoft:main' into issue/155543
MonadChains Jul 23, 2022
24df08c
Add edit breakpoint command
MonadChains Oct 15, 2022
68f8af8
Merge branch 'main' into issue-163528/create-edit-breakpoint-command
MonadChains Dec 18, 2022
3abaa13
Match to closest breakpoint
MonadChains Dec 18, 2022
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
Prev Previous commit
Match to closest breakpoint
  • Loading branch information
@MonadChains
MonadChains committed Dec 18, 2022
commit 3abaa1350edb3700793e4efeddbe8a7adad399c0
25 changes: 19 additions & 6 deletions src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,26 @@ class EditBreakpointAction extends EditorAction {

const position = editor.getPosition();
const debugModel = debugService.getModel();
if (position && editor.hasModel() && debugModel.getBreakpoints({ lineNumber: position.lineNumber }).length > 0) {
if (debugService.getModel().getBreakpoints({ lineNumber: position.lineNumber, column: position.column }).length > 0) {
editor.getContribution<IBreakpointEditorContribution>(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column);
} else {
editor.getContribution<IBreakpointEditorContribution>(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined);
}
if (!(editor.hasModel() && position)) {
return;
}

const lineBreakpoints = debugModel.getBreakpoints({ lineNumber: position.lineNumber });
if (lineBreakpoints.length === 0) {
return;
}

const breakpointDistances = lineBreakpoints.map(b => {
if (!b.column) {
return position.column;
}

return Math.abs(b.column - position.column);
});
const closestBreakpointIndex = breakpointDistances.indexOf(Math.min(...breakpointDistances));
const closestBreakpoint = lineBreakpoints[closestBreakpointIndex];

editor.getContribution<IBreakpointEditorContribution>(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(closestBreakpoint.lineNumber, closestBreakpoint.column);
}
}

Expand Down