From e0e2ce137f9f03a2b92a38222aa45783c66b6c68 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 3 Dec 2015 10:08:18 +0100 Subject: [PATCH] debug: rawAttach should also pass in the source map data. --- src/vs/workbench/parts/debug/common/debug.ts | 2 +- .../parts/debug/electron-browser/debugService.ts | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index a40b47763b1..33132c7199b 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -249,7 +249,7 @@ export interface IDebugService extends ee.IEventEmitter { createSession(): Promise; restartSession(): Promise; - rawAttach(type: string, port: number): Promise; + rawAttach(port: number): Promise; getActiveSession(): IRawDebugSession; getModel(): IModel; diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 9c12d192db2..3d24327fd13 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -135,7 +135,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService // Attach: PH is ready to be attached to if (broadcast.channel === PLUGIN_ATTACH_BROADCAST_CHANNEL) { - this.rawAttach('extensionHost', broadcast.payload.port); + this.rawAttach(broadcast.payload.port); return; } @@ -566,15 +566,18 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService }); } - public rawAttach(type: string, port: number): Promise { + public rawAttach(port: number): Promise { if (this.session) { return this.session.attach({ port }); } + const configuration = this.configurationManager.getConfiguration(); return this.doCreateSession({ - type, + type: configuration.type, request: 'attach', - port + port, + sourceMaps: configuration.sourceMaps, + outDir: configuration.outDir }, true); } -- GitLab