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

Revert "extract more functionality into IWorkspace"

Browse Source 
This reverts commit 25b4b172e4.
This commit is contained in:
Benjamin Pasero
2017-06-12 10:37:44 +02:00
parent 7a927e308f
commit 9754a2107d
11 changed files with 73 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ import { ExtHostThreadService } from 'vs/workbench/services/thread/common/extHos
import { QueryType, ISearchQuery } from 'vs/platform/search/common/search';
import { DiskSearch } from 'vs/workbench/services/search/node/searchService';
import { RemoteTelemetryService } from 'vs/workbench/api/node/extHostTelemetry';
import { IWorkspaceContextService, WorkspaceContextService, Workspace } from 'vs/platform/workspace/common/workspace';
import { IWorkspaceContextService, WorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IInitData, IEnvironment, MainContext } from 'vs/workbench/api/node/extHost.protocol';
import * as errors from 'vs/base/common/errors';
@@ -43,14 +43,7 @@ export class ExtensionHostMain {
constructor(remoteCom: IRemoteCom, initData: IInitData) {
// services
this._environment = initData.environment;
const workspaceRaw = initData.contextService.workspace;
let workspace: Workspace;
if (workspaceRaw) {
workspace = new Workspace(workspaceRaw.resource, workspaceRaw.uid, workspaceRaw.name);
}
this._contextService = new WorkspaceContextService(workspace);
this._contextService = new WorkspaceContextService(initData.contextService.workspace);
const threadService = new ExtHostThreadService(remoteCom);
const telemetryService = new RemoteTelemetryService('pluginHostTelemetry', threadService);
this._extensionService = new ExtHostExtensionService(initData, threadService, telemetryService, this._contextService);