From f2701636706e9acb42a106e808dcbb51896d366b Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 17 Aug 2016 11:56:45 +0200 Subject: [PATCH] cli: debugExtensionHostPort => debugPluginHost --- src/vs/code/electron-main/env.ts | 5 +++-- src/vs/code/electron-main/window.ts | 2 +- src/vs/code/electron-main/windows.ts | 2 +- src/vs/platform/environment/common/environment.ts | 2 ++ src/vs/platform/environment/node/environmentService.ts | 7 +++++++ src/vs/platform/workspace/common/workspace.ts | 1 - .../services/thread/electron-browser/threadService.ts | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/env.ts b/src/vs/code/electron-main/env.ts index bb198565d8d..0d31c08010b 100644 --- a/src/vs/code/electron-main/env.ts +++ b/src/vs/code/electron-main/env.ts @@ -29,7 +29,7 @@ export interface IProcessEnvironment { export interface ICommandLineArguments { verbose: boolean; - debugExtensionHostPort: number; + debugPluginHost: string; debugBrkExtensionHost: boolean; debugBrkFileWatcherPort: number; logExtensionHostCommunication: boolean; @@ -162,6 +162,7 @@ export class EnvService implements IEnvService { const debugBrkExtensionHostPort = getNumericValue(argv.debugBrkPluginHost, 5870); const debugExtensionHostPort = getNumericValue(argv.debugPluginHost, 5870, this.isBuilt ? void 0 : 5870); + const debugPluginHost = debugBrkExtensionHostPort ? String(debugBrkExtensionHostPort) : debugExtensionHostPort ? String(debugExtensionHostPort): void 0; const pathArguments = parsePathArguments(this._currentWorkingDirectory, argv._, argv.goto); const timestamp = parseInt(argv.timestamp); const debugBrkFileWatcherPort = getNumericValue(argv.debugBrkFileWatcherPort, void 0); @@ -171,7 +172,7 @@ export class EnvService implements IEnvService { programStart: types.isNumber(timestamp) ? timestamp : 0, enablePerformance: argv.performance, verbose: argv.verbose, - debugExtensionHostPort: debugBrkExtensionHostPort || debugExtensionHostPort, + debugPluginHost, debugBrkExtensionHost: !!debugBrkExtensionHostPort, logExtensionHostCommunication: argv.logExtensionHostCommunication, debugBrkFileWatcherPort: debugBrkFileWatcherPort, diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index 36760003d0d..e09823a2f1a 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -411,7 +411,7 @@ export class VSCodeWindow { configuration.verbose = cli.verbose; configuration.logExtensionHostCommunication = cli.logExtensionHostCommunication; configuration.debugBrkFileWatcherPort = cli.debugBrkFileWatcherPort; - configuration.debugExtensionHostPort = cli.debugExtensionHostPort; + configuration.debugPluginHost = cli.debugPluginHost; configuration.debugBrkExtensionHost = cli.debugBrkExtensionHost; configuration.extensionsHomePath = cli.extensionsHomePath; } diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index 77766b09a4c..34d9ce31bb5 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -927,7 +927,7 @@ export class WindowsManager implements IWindowsService { configuration.logExtensionHostCommunication = currentWindowConfig.logExtensionHostCommunication; configuration.debugBrkFileWatcherPort = currentWindowConfig.debugBrkFileWatcherPort; configuration.debugBrkExtensionHost = currentWindowConfig.debugBrkExtensionHost; - configuration.debugExtensionHostPort = currentWindowConfig.debugExtensionHostPort; + configuration.debugPluginHost = currentWindowConfig.debugPluginHost; configuration.extensionsHomePath = currentWindowConfig.extensionsHomePath; } } diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index 3e3e873aea1..8294435bef2 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -22,6 +22,8 @@ export interface IEnvironmentService { extensionsPath: string; extensionDevelopmentPath: string; + debugExtensionHostPort: number; + isBuilt: boolean; verbose: boolean; diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index 04d07fa1ab0..cd17a968ba7 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -39,6 +39,9 @@ export class EnvironmentService implements IEnvironmentService { private _extensionDevelopmentPath: string; get extensionDevelopmentPath(): string { return this._extensionDevelopmentPath; } + private _debugExtensionHostPort: number; + get debugExtensionHostPort(): number { return this._debugExtensionHostPort; } + get isBuilt(): boolean { return !process.env['VSCODE_DEV']; } get verbose(): boolean { return this.args.verbose; } @@ -57,5 +60,9 @@ export class EnvironmentService implements IEnvironmentService { this._extensionsPath = path.normalize(this._extensionsPath); this._extensionDevelopmentPath = args.extensionDevelopmentPath; + + if (args.debugPluginHost) { + this._debugExtensionHostPort = Number(args.debugPluginHost); + } } } \ No newline at end of file diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts index a8abedaf6fc..79024aa448d 100644 --- a/src/vs/platform/workspace/common/workspace.ts +++ b/src/vs/platform/workspace/common/workspace.ts @@ -118,7 +118,6 @@ export interface IEnvironment { appSettingsPath: string; appKeybindingsPath: string; - debugExtensionHostPort: number; debugBrkExtensionHost: boolean; disableExtensions: boolean; diff --git a/src/vs/workbench/services/thread/electron-browser/threadService.ts b/src/vs/workbench/services/thread/electron-browser/threadService.ts index 6ded579a2f5..582ee84318a 100644 --- a/src/vs/workbench/services/thread/electron-browser/threadService.ts +++ b/src/vs/workbench/services/thread/electron-browser/threadService.ts @@ -140,7 +140,7 @@ class ExtensionHostProcessManager { this.initializeExtensionHostProcess = new TPromise((c, e) => { // Resolve additional execution args (e.g. debug) - return this.resolveDebugPort(this.contextService.getConfiguration().env.debugExtensionHostPort, port => { + return this.resolveDebugPort(this.environmentService.debugExtensionHostPort, port => { if (port) { opts.execArgv = ['--nolazy', (this.isExtensionDevelopmentDebugging ? '--debug-brk=' : '--debug=') + port]; }