Extension host debugging: change to a model where VS Code triggers reattach (instead of polling)

Benjamin Pasero · Benjamin Pasero · commit 58cd13b642a6 · 2015-12-02T21:18:54.000+01:00
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -44,7 +44,7 @@ import { IPluginService, IPluginDescription } from 'vs/platform/plugins/common/p
 import { IOutputService } from 'vs/workbench/parts/output/common/output';
 import { IKeybindingService, IKeybindingContextKey } from 'vs/platform/keybinding/common/keybindingService';
 import { IWindowService, IBroadcast } from 'vs/workbench/services/window/electron-browser/windowService';
-import { ILogEntry, PLUGIN_LOG_BROADCAST_CHANNEL } from 'vs/workbench/services/thread/electron-browser/threadService';
+import { ILogEntry, PLUGIN_LOG_BROADCAST_CHANNEL, PLUGIN_ATTACH_BROADCAST_CHANNEL } from 'vs/workbench/services/thread/electron-browser/threadService';
 
 var DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
 var DEBUG_BREAKPOINTS_ACTIVATED_KEY = 'debug.breakpointactivated';
@@ -132,6 +132,15 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
 	}
 
 	private onBroadcast(broadcast: IBroadcast): void {
+
+		// Attach: PH is ready to be attached to
+		if (broadcast.channel === PLUGIN_ATTACH_BROADCAST_CHANNEL) {
+			this.rawAttach('extensionHost', broadcast.payload.port);
+
+			return;
+		}
+
+		// From this point on we require an active session
 		let session = this.getActiveSession();
 		if (!session || session.getType() !== 'extensionHost') {
 			return; // we are only intersted if we have an active debug session for extensionHost
diff --git a/src/vs/workbench/services/thread/electron-browser/threadService.ts b/src/vs/workbench/services/thread/electron-browser/threadService.ts
@@ -27,6 +27,7 @@ import cp = require('child_process');
 import ipc = require('ipc');
 
 export const PLUGIN_LOG_BROADCAST_CHANNEL = 'vscode:pluginLog';
+export const PLUGIN_ATTACH_BROADCAST_CHANNEL = 'vscode:pluginAttach';
 
 // Enable to see detailed message communication between window and plugin host
 const logPluginHostCommunication = false;
@@ -126,14 +127,24 @@ class PluginHostProcessManager {
 		this.initializePluginHostProcess = new TPromise<cp.ChildProcess>((c, e) => {
 
 			// Resolve additional execution args (e.g. debug)
-			return this.resolveExecArgv(config, (execArgv) => {
-				if (execArgv) {
-					opts.execArgv = execArgv;
+			return this.resolveDebugPort(config, (port) => {
+				if (port) {
+					opts.execArgv = ['--nolazy', (config.env.debugBrkPluginHost ? '--debug-brk=' : '--debug=') + port];
 				}
 
 				// Run Plugin Host as fork of current process
 				this.pluginHostProcessHandle = cp.fork(uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=pluginHost'], opts);
 
+				// Notify debugger that we are ready to attach to the process if we run a development plugin
+				if (config.env.pluginDevelopmentPath && port) {
+					this.windowService.broadcast({
+						channel: PLUGIN_ATTACH_BROADCAST_CHANNEL,
+						payload: {
+							port: port
+						}
+					});
+				}
+
 				// Messages from Plugin host
 				this.pluginHostProcessHandle.on('message', (msg) => {
 
@@ -251,7 +262,7 @@ class PluginHostProcessManager {
 		}, () => this.terminate());
 	}
 
-	private resolveExecArgv(config: IConfiguration, clb: (execArgv: any) => void): void {
+	private resolveDebugPort(config: IConfiguration, clb: (port: number) => void): void {
 
 		// Check for a free debugging port
 		if (typeof config.env.debugPluginHostPort === 'number') {
@@ -272,7 +283,7 @@ class PluginHostProcessManager {
 					console.info('%c[Plugin Host] %cdebugger listening on port ' + port, 'color: blue', 'color: black');
 				}
 
-				return clb(['--nolazy', (config.env.debugBrkPluginHost ? '--debug-brk=' : '--debug=') + port]);
+				return clb(port);
 			});
 		}
 
