fix dead lock - wait for workspace initialization while starting exthost

src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts

@@ -44,7 +44,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@ILabelService private readonly _labelService: ILabelService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace);
-		this._proxy.$initializeWorkspace(this.getWorkspaceData(this._contextService.getWorkspace()));
+		this._contextService.getCompleteWorkspace().then(workspace => this._proxy.$initializeWorkspace(this.getWorkspaceData(workspace)));
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
 		this._contextService.onDidChangeWorkbenchState(this._onDidChangeWorkspace, this, this._toDispose);
 	}

src/vs/workbench/api/node/extHostExtensionService.ts

@@ -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(() => {