From fb59b1b8f1e50ead3baf362a24a27546984a0e45 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Fri, 7 Oct 2016 11:24:22 +0200
Subject: [PATCH] remove shared process connection from ext host

---
 src/vs/workbench/node/extensionHostMain.ts    |  3 +--
 src/vs/workbench/node/extensionHostProcess.ts | 23 ++++---------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 31c77f33aed..62460d02cb0 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -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;
diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts
index f37d2f14855..d60ec327d6b 100644
--- a/src/vs/workbench/node/extensionHostProcess.ts
+++ b/src/vs/workbench/node/extensionHostProcess.ts
@@ -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));
-	});
\ No newline at end of file
+connectToRenderer().then(renderer => {
+	const extensionHostMain = new ExtensionHostMain(renderer.remoteCom, renderer.initData);
+	onTerminate = () => extensionHostMain.terminate();
+	return extensionHostMain.start();
+}).done(null, err => console.error(err));
\ No newline at end of file
-- 
GitLab