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

Cleanup in RPCProtocol

Browse Source
This commit is contained in:
Alex Dima
2017-08-15 11:01:22 +02:00
parent b63e14f763
commit 0c504ea0b0
7 changed files with 110 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import nls = require('vs/nls');
import pfs = require('vs/base/node/pfs');
import { TPromise } from 'vs/base/common/winjs.base';
import { join } from 'path';
import { IRemoteCom } from 'vs/workbench/services/extensions/node/ipcRemoteCom';
import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
import { ExtHostThreadService } from 'vs/workbench/services/thread/node/extHostThreadService';
import { QueryType, ISearchQuery } from 'vs/platform/search/common/search';
@@ -40,12 +40,12 @@ export class ExtensionHostMain {
private _environment: IEnvironment;
private _extensionService: ExtHostExtensionService;
constructor(remoteCom: IRemoteCom, initData: IInitData) {
constructor(rpcProtocol: RPCProtocol, initData: IInitData) {
this._environment = initData.environment;
this._workspace = initData.workspace;
// services
const threadService = new ExtHostThreadService(remoteCom);
const threadService = new ExtHostThreadService(rpcProtocol);
const telemetryService = new RemoteTelemetryService('pluginHostTelemetry', threadService);
this._extensionService = new ExtHostExtensionService(initData, threadService, telemetryService);

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

@@ -8,7 +8,7 @@
import { onUnexpectedError } from 'vs/base/common/errors';
import { TPromise } from 'vs/base/common/winjs.base';
import { ExtensionHostMain, exit } from 'vs/workbench/node/extensionHostMain';
import { IRemoteCom, createProxyProtocol } from 'vs/workbench/services/extensions/node/ipcRemoteCom';
import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
import { parse } from 'vs/base/common/marshalling';
import { IInitData } from 'vs/workbench/api/node/extHost.protocol';
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
@@ -17,7 +17,7 @@ import { createConnection } from 'net';
import Event, { filterEvent } from 'vs/base/common/event';
interface IRendererConnection {
remoteCom: IRemoteCom;
rpcProtocol: RPCProtocol;
initData: IInitData;
}
@@ -71,7 +71,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): TPromise<IRendere
first.dispose();
const initData = parse(raw);
const remoteCom = createProxyProtocol(protocol);
const rpcProtocol = new RPCProtocol(protocol);
// Print a console message when rejection isn't handled within N seconds. For details:
// see https://nodejs.org/api/process.html#process_event_unhandledrejection
@@ -112,7 +112,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): TPromise<IRendere
// Tell the outside that we are initialized
protocol.send('initialized');
c({ remoteCom, initData });
c({ rpcProtocol, initData });
});
// Tell the outside that we are ready to receive messages
@@ -125,7 +125,7 @@ createExtHostProtocol().then(protocol => {
return connectToRenderer(protocol);
}).then(renderer => {
// setup things
const extensionHostMain = new ExtensionHostMain(renderer.remoteCom, renderer.initData);
const extensionHostMain = new ExtensionHostMain(renderer.rpcProtocol, renderer.initData);
onTerminate = () => extensionHostMain.terminate();
return extensionHostMain.start();
}).done(null, err => console.error(err));