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

remove shared process connection from ext host

Browse Source
This commit is contained in:
Joao Moreno
2016-10-07 11:24:22 +02:00
parent 052679a740
commit fb59b1b8f1
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import {ExtHostThreadService} from 'vs/workbench/services/thread/common/extHostT
import {RemoteTelemetryService} from 'vs/workbench/api/node/extHostTelemetry';
import {ExtensionScanner, MessagesCollector} from 'vs/workbench/node/extensionPoints';
import {IWorkspaceContextService, WorkspaceContextService} from 'vs/platform/workspace/common/workspace';
import {Client} from 'vs/base/parts/ipc/node/ipc.net';
const DIRNAME = URI.parse(require.toUrl('./')).fsPath;
const BASE_PATH = paths.normalize(paths.join(DIRNAME, '../../../..'));
@@ -66,7 +65,7 @@ export class ExtensionHostMain {
private _environment: IEnvironment;
private _extensionService: ExtHostExtensionService;
constructor(remoteCom: IMainProcessExtHostIPC, initData: IInitData, sharedProcessClient: Client) {
constructor(remoteCom: IMainProcessExtHostIPC, initData: IInitData) {
this._isTerminating = false;
this._environment = initData.environment;

23
src/vs/workbench/node/extensionHostProcess.ts
View File

@@ -8,7 +8,6 @@
import {onUnexpectedError} from 'vs/base/common/errors';
import { TPromise } from 'vs/base/common/winjs.base';
import { ExtensionHostMain, IInitData, exit } from 'vs/workbench/node/extensionHostMain';
import { Client, connect } from 'vs/base/parts/ipc/node/ipc.net';
import { create as createIPC, IMainProcessExtHostIPC } from 'vs/platform/extensions/common/ipcRemoteCom';
import marshalling = require('vs/base/common/marshalling');
@@ -103,20 +102,8 @@ function connectToRenderer(): TPromise<IRendererConnection> {
});
}
function connectToSharedProcess(): TPromise<Client> {
return connect(process.env['VSCODE_SHARED_IPC_HOOK'], `extensionHost:${ process.env['VSCODE_WINDOW_ID'] }`);
}
TPromise.join<any>([connectToRenderer(), connectToSharedProcess()])
.done(result => {
const renderer: IRendererConnection = result[0];
const sharedProcessClient: Client = result[1];
const extensionHostMain = new ExtensionHostMain(renderer.remoteCom, renderer.initData, sharedProcessClient);
onTerminate = () => {
extensionHostMain.terminate();
};
extensionHostMain.start()
.done(null, err => console.error(err));
});
connectToRenderer().then(renderer => {
const extensionHostMain = new ExtensionHostMain(renderer.remoteCom, renderer.initData);
onTerminate = () => extensionHostMain.terminate();
return extensionHostMain.start();
}).done(null, err => console.error(err));