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

fix dead lock - wait for workspace initialization while starting exthost

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-02-21 12:00:39 +01:00
parent 564b7120ab
commit 4c7870316d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHostExtensionService.ts
View File

@@ -245,7 +245,6 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
private async _initialize(): Promise<void> {
try {
const configProvider = await this._extHostConfiguration.getConfigProvider();
await this._extHostWorkspace.waitForInitializeCall();
await initializeExtensionApi(this, this._extensionApiFactory, this._registry, configProvider);
// Do this when extension service exists, but extensions are not being activated yet.
await connectProxyResolver(this._extHostWorkspace, configProvider, this, this._extHostLogService, this._mainThreadTelemetryProxy);
@@ -658,6 +657,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
this._started = true;
return this._barrier.wait()
.then(() => this._extHostWorkspace.waitForInitializeCall())
.then(() => this._handleEagerExtensions())
.then(() => this._handleExtensionTests())
.then(() => {