Skip to content
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

Jump to bottom

Vscode debug patches #2463

Merged
merged 3 commits into from
Jul 30, 2018
Merged

Vscode debug patches #2463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9af9070
Support launch requests
thegecko Jul 30, 2018
2611755
Support deprecated 'lines' object for breakpoints
thegecko Jul 30, 2018
90d1cae
Support exceptions from the debugger
thegecko Jul 30, 2018
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
4 changes: 3 additions & 1 deletion packages/debug/src/browser/breakpoint/breakpoint-applier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export class BreakpointsApplier {
for (const breakpointsBySource of DebugUtils.groupBySource(breakpoints).values()) {
const args: DebugProtocol.SetBreakpointsArguments = {
source: breakpointsBySource[0].source!,
breakpoints: breakpointsBySource.map(b => b.origin as DebugProtocol.SourceBreakpoint)
breakpoints: breakpointsBySource.map(b => b.origin as DebugProtocol.SourceBreakpoint),
// Although marked as deprecated, some debug adapters still use lines
lines: breakpointsBySource.map(b => (b.origin as DebugProtocol.SourceBreakpoint).line)
};

// The array elements are in the same order as the elements
Expand Down
1 change: 1 addition & 0 deletions packages/debug/src/browser/breakpoint/breakpoint-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ export class BreakpointsManager implements FrontendApplicationContribution {

if (body.threadId) {
switch (body.reason) {
case 'exception':
case 'breakpoint':
case 'entry':
case 'step': {
Expand Down
4 changes: 4 additions & 0 deletions packages/debug/src/browser/debug-session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,10 @@ export class DebugSessionManager {
const attachArgs: DebugProtocol.AttachRequestArguments = Object.assign(debugConfiguration, { __restart: false });
return session.attach(attachArgs);
}
case "launch": {
const launchArgs: DebugProtocol.LaunchRequestArguments = Object.assign(debugConfiguration, { __restart: false, noDebug: false });
return session.launch(launchArgs);
}
default: return Promise.reject(`Unsupported request '${request}' type.`);
}
})
Expand Down