cli: debugExtensionHostPort => debugPluginHost
This commit is contained in:
parent
98fd5aa1e5
commit
f270163670
7 changed files with 15 additions and 6 deletions
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,6 +22,8 @@ export interface IEnvironmentService {
|
|||
extensionsPath: string;
|
||||
extensionDevelopmentPath: string;
|
||||
|
||||
debugExtensionHostPort: number;
|
||||
|
||||
isBuilt: boolean;
|
||||
verbose: boolean;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -118,7 +118,6 @@ export interface IEnvironment {
|
|||
appSettingsPath: string;
|
||||
appKeybindingsPath: string;
|
||||
|
||||
debugExtensionHostPort: number;
|
||||
debugBrkExtensionHost: boolean;
|
||||
disableExtensions: boolean;
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@ class ExtensionHostProcessManager {
|
|||
this.initializeExtensionHostProcess = new TPromise<ChildProcess>((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];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue