Skip to content

Commit be2034c

Browse files
author
Benjamin Pasero
committed
keep environment service simple
1 parent 48ff5e7 commit be2034c

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

src/vs/code/node/cliProcessMain.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { RequestService } from 'vs/platform/request/node/requestService';
3030
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
3131
import { NodeConfigurationService } from 'vs/platform/configuration/node/nodeConfigurationService';
3232
import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
33+
import {mkdirp} from 'vs/base/node/pfs';
3334

3435
const notFound = id => localize('notFound', "Extension '{0}' not found.", id);
3536
const notInstalled = id => localize('notInstalled', "Extension '{0}' is not installed.", id);
@@ -151,7 +152,7 @@ export function main(argv: ParsedArgs): TPromise<void> {
151152
return instantiationService.invokeFunction(accessor => {
152153
const envService = accessor.get(IEnvironmentService);
153154

154-
return envService.createPaths().then(() => {
155+
return TPromise.join([envService.userHome, envService.extensionsPath].map(p => mkdirp(p))).then(() => {
155156
const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt } = envService;
156157

157158
const services = new ServiceCollection();

src/vs/platform/environment/common/environment.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87

98
export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
109

@@ -27,6 +26,4 @@ export interface IEnvironmentService {
2726
verbose: boolean;
2827

2928
debugBrkFileWatcherPort: number;
30-
31-
createPaths(): TPromise<void>;
3229
}

src/vs/platform/environment/node/environmentService.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ import product from 'vs/platform/product';
99
import pkg from 'vs/platform/package';
1010
import * as os from 'os';
1111
import * as path from 'path';
12-
import {mkdirp} from 'vs/base/node/pfs';
1312
import {ParsedArgs} from 'vs/code/node/argv';
1413
import URI from 'vs/base/common/uri';
15-
import {TPromise} from 'vs/base/common/winjs.base';
1614

1715
export class EnvironmentService implements IEnvironmentService {
1816

@@ -61,10 +59,4 @@ export class EnvironmentService implements IEnvironmentService {
6159

6260
this._extensionDevelopmentPath = argv.extensionDevelopmentPath;
6361
}
64-
65-
createPaths(): TPromise<void> {
66-
const promises = [this.userHome, this.extensionsPath].map(p => mkdirp(p));
67-
68-
return TPromise.join(promises) as TPromise<any>;
69-
}
7062
}

0 commit comments

Comments
 (0)