Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid realpathSync, #16388

Browse Source
This commit is contained in:
Johannes Rieken
2016-12-05 11:36:14 +01:00
parent 4af3d1797d
commit 156b4d2550
2 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/node/extensionHostMain.ts
View File

@@ -11,7 +11,7 @@ import nls = require('vs/nls');
import pfs = require('vs/base/node/pfs');
import { TPromise } from 'vs/base/common/winjs.base';
import paths = require('vs/base/common/paths');
import { createApiFactory, defineAPI } from 'vs/workbench/api/node/extHost.api.impl';
import { createApiFactory, initializeExtensionApi } from 'vs/workbench/api/node/extHost.api.impl';
import { IMainProcessExtHostIPC } from 'vs/platform/extensions/common/ipcRemoteCom';
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
import { ExtHostThreadService } from 'vs/workbench/services/thread/common/extHostThreadService';
@@ -39,6 +39,7 @@ export class ExtensionHostMain {
private _contextService: IWorkspaceContextService;
private _environment: IEnvironment;
private _extensionService: ExtHostExtensionService;
private _extensionApiCreation: TPromise<void>;
constructor(remoteCom: IMainProcessExtHostIPC, initData: IInitData) {
this._isTerminating = false;
@@ -59,8 +60,8 @@ export class ExtensionHostMain {
errors.setUnexpectedErrorHandler(err => mainThreadErrors.onUnexpectedExtHostError(errors.transformErrorForSerialization(err)));
// Create the ext host API
const factory = createApiFactory(initData, threadService, this._extensionService, this._contextService);
defineAPI(factory, this._extensionService);
const apiFactory = createApiFactory(initData, threadService, this._extensionService, this._contextService);
this._extensionApiCreation = initializeExtensionApi(this._extensionService, apiFactory);
}
private _getOrCreateWorkspaceStoragePath(): string {
@@ -111,7 +112,9 @@ export class ExtensionHostMain {
}
public start(): TPromise<void> {
return this.handleEagerExtensions().then(() => this.handleExtensionTests());
return this._extensionApiCreation
.then(() => this.handleEagerExtensions())
.then(() => this.handleExtensionTests());
}
public terminate(): void {