diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index b255a1fcb8fd8edcb2f5680974e6c90f85ace8e6..0278accbc54cac383999e1b92d1cde37f4414bc6 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -76,6 +76,31 @@ import { VSCodeApplication } from "vs/code/electron-main/app"; // // Helpers // + +function createServices(args: ParsedArgs): IInstantiationService { + const services = new ServiceCollection(); + + services.set(IEnvironmentService, new SyncDescriptor(EnvironmentService, args, process.execPath)); + services.set(ILogService, new SyncDescriptor(MainLogService)); + services.set(ILifecycleService, new SyncDescriptor(LifecycleService)); + services.set(IStorageService, new SyncDescriptor(StorageService)); + services.set(IConfigurationService, new SyncDescriptor(ConfigurationService)); + services.set(IRequestService, new SyncDescriptor(RequestService)); + services.set(IURLService, new SyncDescriptor(URLService, args['open-url'])); + services.set(IBackupMainService, new SyncDescriptor(BackupMainService)); + + return new InstantiationService(services, true); +} + +function createPaths(environmentService: IEnvironmentService): TPromise { + const paths = [ + environmentService.appSettingsHome, + environmentService.extensionsPath, + environmentService.nodeCachedDataDir + ]; + return TPromise.join(paths.map(p => p && mkdirp(p))) as TPromise; +} + function setupIPC(accessor: ServicesAccessor): TPromise { const logService = accessor.get(ILogService); const environmentService = accessor.get(IEnvironmentService); @@ -162,30 +187,6 @@ function setupIPC(accessor: ServicesAccessor): TPromise { return setup(true); } -function createPaths(environmentService: IEnvironmentService): TPromise { - const paths = [ - environmentService.appSettingsHome, - environmentService.extensionsPath, - environmentService.nodeCachedDataDir - ]; - return TPromise.join(paths.map(p => p && mkdirp(p))) as TPromise; -} - -function createServices(args: ParsedArgs): IInstantiationService { - const services = new ServiceCollection(); - - services.set(IEnvironmentService, new SyncDescriptor(EnvironmentService, args, process.execPath)); - services.set(ILogService, new SyncDescriptor(MainLogService)); - services.set(ILifecycleService, new SyncDescriptor(LifecycleService)); - services.set(IStorageService, new SyncDescriptor(StorageService)); - services.set(IConfigurationService, new SyncDescriptor(ConfigurationService)); - services.set(IRequestService, new SyncDescriptor(RequestService)); - services.set(IURLService, new SyncDescriptor(URLService, args['open-url'])); - services.set(IBackupMainService, new SyncDescriptor(BackupMainService)); - - return new InstantiationService(services, true); -} - function quit(accessor: ServicesAccessor, errorOrMessage?: Error | string): void { const logService = accessor.get(ILogService); const lifecycleService = accessor.get(ILifecycleService);