From dc83809862a5edc9a1d7052a17e6982c2f67d0fd Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Tue, 29 Mar 2016 12:02:19 +0200 Subject: [PATCH] update debug protocol. Fixes Microsoft/vscode-debugadapter-node#11 --- package.json | 2 +- .../parts/debug/common/debugModel.ts | 2 +- .../parts/debug/common/debugProtocol.d.ts | 25 ++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 80222ca9377..eaabe23b405 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "native-keymap": "^0.1.2", "sax": "^1.1.1", "semver": "^4.2.0", - "vscode-debugprotocol": "^1.6.1", + "vscode-debugprotocol": "1.8.0-pre.1", "vscode-textmate": "^1.0.11", "weak": "^1.0.1", "winreg": "0.0.12", diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 7105eb58e8d..0a21cdc0b25 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -443,7 +443,7 @@ export class Model extends ee.EventEmitter implements debug.IModel { return this.exceptionBreakpoints; } - public setExceptionBreakpoints(data: [{ filter: string, label: string, default?: boolean }]): void { + public setExceptionBreakpoints(data: DebugProtocol.ExceptionBreakpointsFilter[]): void { if (data) { this.exceptionBreakpoints = data.map(d => { const ebp = this.exceptionBreakpoints.filter(ebp => ebp.filter === d.filter).pop(); diff --git a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts index 9cdbf785e61..b07b53fbfd8 100644 --- a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts +++ b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts @@ -193,7 +193,8 @@ declare module DebugProtocol { } /** Arguments for "launch" request. */ export interface LaunchRequestArguments { - /* The launch request has no standardized attributes. */ + /* If noDebug is true the launch request should launch the program without enabling debugging. */ + noDebug?: boolean; } /** Response to "launch" request. This is just an acknowledgement, so no body field is required. */ export interface LaunchResponse extends Response { @@ -501,18 +502,18 @@ declare module DebugProtocol { supportsConditionalBreakpoints?: boolean; /** The debug adapter supports a (side effect free) evaluate request for data hovers. */ supportsEvaluateForHovers?: boolean; - /** Available filters for the setExceptionBreakpoints request. */ - exceptionBreakpointFilters?: [ - { - /** The internal ID of the filter. This value is passed to the setExceptionBreakpoints request. */ - filter: string, - /** The name of the filter. This will be shown in the UI. */ - label: string, - /** Initial value of the filter. If not specified a value 'false' is assumed. */ - default?: boolean - } - ] + exceptionBreakpointFilters?: ExceptionBreakpointsFilter[]; + } + + /** An ExceptionBreakpointsFilter is shown in the UI as an option for configuring how exceptions are dealt with. */ + export interface ExceptionBreakpointsFilter { + /** The internal ID of the filter. This value is passed to the setExceptionBreakpoints request. */ + filter: string, + /** The name of the filter. This will be shown in the UI. */ + label: string, + /** Initial value of the filter. If not specified a value 'false' is assumed. */ + default?: boolean } /** A structured message object. Used to return errors from requests. */