Tweak IExtHostContext

alexdima · alexdima · commit e146b7aad664 · 2018-11-07T20:55:08.000+01:00
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -68,6 +68,7 @@ export interface IInitData {
 	telemetryInfo: ITelemetryInfo;
 	logLevel: LogLevel;
 	logsLocation: URI;
+	remoteAuthority?: string | null;
 }
 
 export interface IConfigurationInitData extends IConfigurationData {
@@ -80,6 +81,7 @@ export interface IWorkspaceConfigurationChangeEventData {
 }
 
 export interface IExtHostContext extends IRPCProtocol {
+	remoteAuthority: string;
 }
 
 export interface IMainContext extends IRPCProtocol {
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -133,6 +133,7 @@ export class ExtensionHostProcessManager extends Disposable {
 
 	constructor(
 		extensionHostProcessWorker: IExtensionHostStarter,
+		private readonly _remoteAuthority: string,
 		initialActivationEvents: string[],
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -193,6 +194,7 @@ export class ExtensionHostProcessManager extends Disposable {
 		this._extensionHostProcessRPCProtocol = new RPCProtocol(protocol, logger);
 		this._register(this._extensionHostProcessRPCProtocol.onDidChangeResponsiveState((responsiveState: ResponsiveState) => this._onDidChangeResponsiveState.fire(responsiveState)));
 		const extHostContext: IExtHostContext = {
+			remoteAuthority: this._remoteAuthority,
 			getProxy: <T>(identifier: ProxyIdentifier<T>): T => this._extensionHostProcessRPCProtocol.getProxy(identifier),
 			set: <T, R extends T>(identifier: ProxyIdentifier<T>, instance: R): R => this._extensionHostProcessRPCProtocol.set(identifier, instance),
 			assertRegistered: (identifiers: ProxyIdentifier<any>[]): void => this._extensionHostProcessRPCProtocol.assertRegistered(identifiers),
@@ -384,7 +386,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 		this._stopExtensionHostProcess();
 
 		const extHostProcessWorker = this._instantiationService.createInstance(ExtensionHostProcessWorker, this.getExtensions(), this._extensionHostLogsLocation);
-		const extHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, extHostProcessWorker, initialActivationEvents);
+		const extHostProcessManager = this._instantiationService.createInstance(ExtensionHostProcessManager, extHostProcessWorker, null, initialActivationEvents);
 		extHostProcessManager.onDidCrash(([code, signal]) => this._onExtensionHostCrashed(code, signal));
 		extHostProcessManager.onDidChangeResponsiveState((responsiveState) => this._onResponsiveStateChanged(responsiveState));
 		this._extensionHostProcessManagers.push(extHostProcessManager);
diff --git a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts
@@ -10,6 +10,7 @@ import { isThenable } from 'vs/base/common/async';
 
 export function SingleProxyRPCProtocol(thing: any): IExtHostContext {
 	return {
+		remoteAuthority: null,
 		getProxy<T>(): T {
 			return thing;
 		},
@@ -22,6 +23,8 @@ export function SingleProxyRPCProtocol(thing: any): IExtHostContext {
 
 export class TestRPCProtocol implements IExtHostContext {
 
+	public remoteAuthority = null;
+
 	private _callCountValue: number = 0;
 	private _idle: Promise<any>;
 	private _completeIdle: Function;

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ export interface IInitData {`
`68`	`68`	`telemetryInfo: ITelemetryInfo;`
`69`	`69`	`logLevel: LogLevel;`
`70`	`70`	`logsLocation: URI;`
	`71`	`+ remoteAuthority?: string \| null;`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`export interface IConfigurationInitData extends IConfigurationData {`
`@@ -80,6 +81,7 @@ export interface IWorkspaceConfigurationChangeEventData {`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`export interface IExtHostContext extends IRPCProtocol {`
	`84`	`+ remoteAuthority: string;`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`export interface IMainContext extends IRPCProtocol {`