assign execPath also in other places where we use environment service
This commit is contained in:
parent
e1f12e5c1b
commit
16c67219d7
3 changed files with 6 additions and 2 deletions
|
@ -10,6 +10,7 @@ import * as path from 'path';
|
|||
import { parseArgs, ParsedArgs } from 'vs/code/node/argv';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { sequence } from 'vs/base/common/async';
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import { IPager } from 'vs/base/common/paging';
|
||||
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
|
||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||
|
@ -145,7 +146,7 @@ const eventPrefix = 'monacoworkbench';
|
|||
|
||||
export function main(argv: ParsedArgs): TPromise<void> {
|
||||
const services = new ServiceCollection();
|
||||
services.set(IEnvironmentService, new SyncDescriptor(EnvironmentService, parseArgs(process.argv)));
|
||||
services.set(IEnvironmentService, new SyncDescriptor(EnvironmentService, objects.assign(parseArgs(process.argv), { execPath: process.execPath })));
|
||||
|
||||
const instantiationService: IInstantiationService = new InstantiationService(services);
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
import * as fs from 'fs';
|
||||
import * as platform from 'vs/base/common/platform';
|
||||
import product from 'vs/platform/product';
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import pkg from 'vs/platform/package';
|
||||
import { serve, Server, connect } from 'vs/base/parts/ipc/node/ipc.net';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
|
@ -58,7 +59,7 @@ function main(server: Server): void {
|
|||
const services = new ServiceCollection();
|
||||
|
||||
services.set(IEventService, new SyncDescriptor(EventService));
|
||||
services.set(IEnvironmentService, new SyncDescriptor(EnvironmentService, parseArgs(process.argv)));
|
||||
services.set(IEnvironmentService, new SyncDescriptor(EnvironmentService, objects.assign(parseArgs(process.argv), { execPath: process.execPath })));
|
||||
services.set(IConfigurationService, new SyncDescriptor(NodeConfigurationService));
|
||||
services.set(IRequestService, new SyncDescriptor(RequestService));
|
||||
|
||||
|
|
|
@ -11,6 +11,8 @@ import * as path from 'path';
|
|||
import {ParsedArgs} from 'vs/code/node/argv';
|
||||
import URI from 'vs/base/common/uri';
|
||||
|
||||
// TODO@Ben TODO@Joao this interface should be composed once the main => renderer
|
||||
// communication is also fit for that
|
||||
export interface IEnvironment extends ParsedArgs {
|
||||
execPath: string;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue