diff --git a/extensions/node-debug/node-debug.azure.json b/extensions/node-debug/node-debug.azure.json index 311e627f0ed..752458a1b2f 100644 --- a/extensions/node-debug/node-debug.azure.json +++ b/extensions/node-debug/node-debug.azure.json @@ -1,6 +1,6 @@ { "account": "monacobuild", "container": "debuggers", - "zip": "add5842/node-debug.zip", + "zip": "4271a18/node-debug.zip", "output": "" } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f440bdba4d9..bf99d2f3dc6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -416,9 +416,9 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" }, "vscode-debugprotocol": { - "version": "1.5.0", - "from": "vscode-debugprotocol@>=1.5.0", - "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.5.0.tgz" + "version": "1.6.1", + "from": "vscode-debugprotocol@>=1.6.1", + "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.6.1.tgz" }, "vscode-textmate": { "version": "1.0.11", diff --git a/package.json b/package.json index 63a63b29bc7..cf0ec7d93ec 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "native-keymap": "^0.1.2", "sax": "^1.1.1", "semver": "^4.2.0", - "vscode-debugprotocol": "^1.5.0", + "vscode-debugprotocol": "^1.6.1", "vscode-textmate": "^1.0.11", "weak": "^1.0.1", "winreg": "0.0.12", diff --git a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts index a467660890a..17a51cf0142 100644 --- a/src/vs/workbench/parts/debug/common/debugProtocol.d.ts +++ b/src/vs/workbench/parts/debug/common/debugProtocol.d.ts @@ -53,7 +53,8 @@ declare module DebugProtocol { The sequence of events/requests is as follows: - adapters sends InitializedEvent (at any time) - frontend sends zero or more SetBreakpointsRequest - - frontend sends one SetExceptionBreakpointsRequest (in the future 'zero or one') + - frontend sends one SetFunctionBreakpointsRequest + - frontend sends a SetExceptionBreakpointsRequest if one or more exceptionBreakpointFilters have been defined (or if supportsConfigurationDoneRequest is not defined or false) - frontend sends other configuration requests that are added in the future - frontend sends one ConfigurationDoneRequest */ @@ -62,7 +63,7 @@ declare module DebugProtocol { /** Event message for "stopped" event type. The event indicates that the execution of the debugee has stopped due to a break condition. - This can be caused by by a break point previously set, a stepping action has completed or by executing a debugger statement. + This can be caused by a break point previously set, a stepping action has completed or by executing a debugger statement. */ export interface StoppedEvent extends Event { body: { @@ -238,10 +239,12 @@ declare module DebugProtocol { /** Response to "setBreakpoints" request. Returned is information about each breakpoint created by this request. This includes the actual code location and whether the breakpoint could be verified. + The breakpoints returned are in the same order as the elements of the 'breakpoints' + (or the deprecated 'lines') in the SetBreakpointsArguments. */ export interface SetBreakpointsResponse extends Response { body: { - /** Information about the breakpoints. The array elements correspond to the elements of the 'breakpoints' (or the deprecated 'lines) array. */ + /** Information about the breakpoints. The array elements are in the same order as the elements of the 'breakpoints' (or the deprecated 'lines') in the SetBreakpointsArguments. */ breakpoints: Breakpoint[]; }; } @@ -516,6 +519,10 @@ declare module DebugProtocol { sendTelemetry?: boolean; /** if true show user */ showUser?: boolean; + /** An optional url where additional information about this message can be found. */ + url?: string; + /** An optional label that is presented to the user as the UI for opening the url. */ + urlLabel?: string; } /** A Thread */