💄 service context

Benjamin Pasero · Benjamin Pasero · commit 2f2eb547fab3 · 2019-09-24T17:00:15.000+02:00
diff --git a/src/vs/platform/electron/electron-main/electronMainService.ts b/src/vs/platform/electron/electron-main/electronMainService.ts
@@ -10,13 +10,9 @@ import { OpenContext, INativeOpenDialogOptions } from 'vs/platform/windows/commo
 import { isMacintosh } from 'vs/base/common/platform';
 import { IElectronService } from 'vs/platform/electron/node/electron';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
+import { AddContextToFunctions } from 'vs/platform/ipc/node/simpleIpcProxy';
 
-type ElectronServiceInterface = {
-	//  Every property of service: IF property is a FUNCTION						   ADD windowId as first parameter and original parameters afterwards with same return type			 ELSE preserve as is
-	[K in keyof IElectronService]: IElectronService[K] extends (...args: any) => any ? (windowId: number, ...args: Parameters<IElectronService[K]>) => ReturnType<IElectronService[K]> : IElectronService[K]
-};
-
-export class ElectronMainService implements ElectronServiceInterface {
+export class ElectronMainService implements AddContextToFunctions<IElectronService, number> {
 
 	_serviceBrand: undefined;
 
diff --git a/src/vs/platform/ipc/node/simpleIpcProxy.ts b/src/vs/platform/ipc/node/simpleIpcProxy.ts
@@ -11,6 +11,11 @@ import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 // for a very basic process <=> process communication over methods.
 //
 
+export type AddContextToFunctions<Target, Context> = {
+	//  For every property: IF property is a FUNCTION				ADD context as first parameter and original parameters afterwards with same return type, otherwise preserve as is
+	[K in keyof Target]: Target[K] extends (...args: any) => any ? (context: Context, ...args: Parameters<Target[K]>) => ReturnType<Target[K]> : Target[K]
+};
+
 interface ISimpleChannelProxyContext {
 	__$simpleIPCContextMarker: boolean;
 	proxyContext: unknown;
