From b46f585924b15476a1b755d644f6965c23d7243a Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Sun, 18 Jun 2017 19:51:18 -0700 Subject: [PATCH] Add supportsDelayedStackTraceLoading for Microsoft/vscode#28808 --- package-lock.json | 21 ++++++++++++++------- package.json | 8 ++++---- src/chrome/chromeDebugAdapter.ts | 5 +++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb1216328..2a21b37ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1477,7 +1477,7 @@ "node-fetch": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", - "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==", + "integrity": "sha1-iZyz0KPJL5UsR/G4dvTIrqvUANU=", "dev": true }, "nodegit-promise": { @@ -2159,14 +2159,21 @@ } }, "vscode-debugadapter": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.20.0.tgz", - "integrity": "sha1-ZXWvzksOqZ9ixbq3EtXwy/MUhbE=" + "version": "1.21.0-pre.2", + "resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.21.0-pre.2.tgz", + "integrity": "sha1-ieJZ5gZ0+RLnCCUAeMsgtsoerjw=", + "dependencies": { + "vscode-debugprotocol": { + "version": "1.21.0-pre.1", + "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.21.0-pre.1.tgz", + "integrity": "sha1-wzttR8ZIdO32eu+cAwdx65k+AGw=" + } + } }, "vscode-debugprotocol": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.20.0.tgz", - "integrity": "sha1-ytbuzks1On8zL06tYVQpcKtpCD0=" + "version": "1.21.0-pre.1", + "resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.21.0-pre.1.tgz", + "integrity": "sha1-wzttR8ZIdO32eu+cAwdx65k+AGw=" }, "vscode-nls": { "version": "2.0.2", diff --git a/package.json b/package.json index 5e8b6f4be..0f83351cc 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ "noice-json-rpc": "^1.0.0", "request-light": "^0.1.0", "source-map": "^0.5.6", - "vscode-debugadapter": "^1.19.0-pre.0", - "vscode-debugprotocol": "^1.18.0-pre.2", + "vscode-debugadapter": "^1.21.0-pre.2", + "vscode-debugprotocol": "^1.21.0-pre.1", "vscode-nls": "^2.0.2", "ws": "^1.1.1" }, @@ -48,13 +48,13 @@ "tslint-eslint-rules": "^1.5.0", "tslint-microsoft-contrib": "^2.0.10", "typemoq": "^0.3.3", - "typescript": "^2.0.3", + "typescript": "^2.3.4", "vscode-nls-dev": "^2.1.1" }, "scripts": { "build": "gulp build", "watch": "gulp watch", "test": "mocha --recursive -u tdd ./out/test/", - "prepublish": "gulp build" + "prepare": "gulp build" } } diff --git a/src/chrome/chromeDebugAdapter.ts b/src/chrome/chromeDebugAdapter.ts index 5ac836f09..8efb2cb70 100644 --- a/src/chrome/chromeDebugAdapter.ts +++ b/src/chrome/chromeDebugAdapter.ts @@ -185,7 +185,7 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter { public initialize(args: DebugProtocol.InitializeRequestArguments): DebugProtocol.Capabilities { if (args.pathFormat !== 'path') { - return Promise.reject(errors.pathFormat()); + throw errors.pathFormat(); } // because session bypasses dispatchRequest @@ -216,7 +216,8 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter { supportsCompletionsRequest: true, supportsHitConditionalBreakpoints: true, supportsRestartFrame: true, - supportsExceptionInfoRequest: true + supportsExceptionInfoRequest: true, + supportsDelayedStackTraceLoading: true }; }