maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

reduce ICommandLineArgs and let it extend ParsedArgs

Browse source
This commit is contained in:
Benjamin Pasero 2016-08-17 12:24:11 +02:00
parent bd1af53f54
commit 8c049b9bf4
3 changed files with 29 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vs/code/electron-main/env.ts
View file

@ -20,32 +20,15 @@ import URI from 'vs/base/common/uri';
import * as types from 'vs/base/common/types';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import product, { IProductConfiguration } from 'vs/platform/product';
import { parseArgs } from 'vs/code/node/argv';
import { parseArgs, ParsedArgs } from 'vs/code/node/argv';
import pkg from 'vs/platform/package';
export interface IProcessEnvironment {
[key: string]: string;
}
export interface ICommandLineArguments {
verbose: boolean;
debugPluginHost: string;
debugBrkPluginHost: boolean;
debugBrkFileWatcherPort: string;
logExtensionHostCommunication: boolean;
'disable-extensions': boolean;
extensionHomePath: string;
extensionDevelopmentPath: string;
extensionTestsPath: string;
programStart: number;
export interface ICommandLineArguments extends ParsedArgs {
pathArguments?: string[];
performance?: boolean;
'new-window'?: boolean;
'reuse-window'?: boolean;
goto?: boolean;
diff?: boolean;
locale?: string;
wait?: boolean;
}
export const IEnvService = createDecorator<IEnvService>('mainEnvironmentService');
@ -168,12 +151,13 @@ export class EnvService implements IEnvService {
const debugBrkFileWatcherPort = getNumericValue(argv.debugBrkFileWatcherPort, void 0);
this._cliArgs = Object.freeze({
_: [],
pathArguments: pathArguments,
programStart: types.isNumber(timestamp) ? timestamp : 0,
timestamp: types.isNumber(timestamp) ? String(timestamp) : '0',
performance: argv.performance,
verbose: argv.verbose,
debugPluginHost,
debugBrkPluginHost: !!debugBrkExtensionHostPort,
debugBrkPluginHost: String(!!debugBrkExtensionHostPort),
logExtensionHostCommunication: argv.logExtensionHostCommunication,
debugBrkFileWatcherPort: debugBrkFileWatcherPort ? String(debugBrkFileWatcherPort) : void 0,
'new-window': argv['new-window'],

2
src/vs/code/electron-main/main.ts
View file

@ -135,7 +135,7 @@ function main(accessor: ServicesAccessor, mainIpcServer: Server, userEnv: IProce
}
// Set programStart in the global scope
global.programStart = envService.cliArgs.programStart;
global.programStart = envService.cliArgs.timestamp;
function dispose() {
if (mainIpcServer) {

46
src/vs/code/node/argv.ts
View file

@ -8,29 +8,29 @@ import * as minimist from 'minimist';
import { localize } from 'vs/nls';
export interface ParsedArgs extends minimist.ParsedArgs {
help: boolean;
version: boolean;
wait: boolean;
diff: boolean;
goto: boolean;
'new-window': boolean;
'reuse-window': boolean;
locale: string;
'user-data-dir': string;
performance: boolean;
verbose: boolean;
logExtensionHostCommunication: boolean;
debugBrkFileWatcherPort: string;
'disable-extensions': boolean;
extensionHomePath: string;
extensionDevelopmentPath: string;
extensionTestsPath: string;
timestamp: string;
debugBrkPluginHost: string;
debugPluginHost: string;
'list-extensions': boolean;
'install-extension': string | string[];
'uninstall-extension': string | string[];
help?: boolean;
version?: boolean;
wait?: boolean;
diff?: boolean;
goto?: boolean;
'new-window'?: boolean;
'reuse-window'?: boolean;
locale?: string;
'user-data-dir'?: string;
performance?: boolean;
verbose?: boolean;
logExtensionHostCommunication?: boolean;
debugBrkFileWatcherPort?: string;
'disable-extensions'?: boolean;
extensionHomePath?: string;
extensionDevelopmentPath?: string;
extensionTestsPath?: string;
timestamp?: string;
debugBrkPluginHost?: string;
debugPluginHost?: string;
'list-extensions'?: boolean;
'install-extension'?: string | string[];
'uninstall-extension'?: string | string[];
}
const options: minimist.Opts = {