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

make API creation part of extension service readiness, #16499

Browse Source
This commit is contained in:
Johannes Rieken
2016-12-05 14:49:42 +01:00
parent 4ea594e4ab
commit cc4e25f47f
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@ 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, 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';
@@ -37,7 +36,6 @@ export class ExtensionHostMain {
private _contextService: IWorkspaceContextService;
private _environment: IEnvironment;
private _extensionService: ExtHostExtensionService;
private _extensionApiCreation: TPromise<void>;
constructor(remoteCom: IMainProcessExtHostIPC, initData: IInitData) {
// services
@@ -45,19 +43,15 @@ export class ExtensionHostMain {
this._contextService = new WorkspaceContextService(initData.contextService.workspace);
const threadService = new ExtHostThreadService(remoteCom);
const telemetryService = new RemoteTelemetryService('pluginHostTelemetry', threadService);
this._extensionService = new ExtHostExtensionService(initData.extensions, initData.environment, threadService, telemetryService, this._contextService);
this._extensionService = new ExtHostExtensionService(initData, threadService, telemetryService, this._contextService);
// Error forwarding
const mainThreadErrors = threadService.get(MainContext.MainThreadErrors);
errors.setUnexpectedErrorHandler(err => mainThreadErrors.onUnexpectedExtHostError(errors.transformErrorForSerialization(err)));
// Create the ext host API
const apiFactory = createApiFactory(initData, threadService, this._extensionService, this._contextService);
this._extensionApiCreation = initializeExtensionApi(this._extensionService, apiFactory);
}
public start(): TPromise<void> {
return this._extensionApiCreation
return this._extensionService.onReady()
.then(() => this.handleEagerExtensions())
.then(() => this.handleExtensionTests());
}