sandbox - separate native host service implementation from interfaces

src/vs/code/electron-sandbox/issue/issueReporterMain.ts

@@ -5,7 +5,8 @@
 
 import 'vs/css!./media/issueReporter';
 import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
-import { NativeHostService, INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
 import { ipcRenderer, process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { applyZoom, zoomIn, zoomOut } from 'vs/platform/windows/electron-sandbox/window';
 import { $, reset, windowOpenNoOpener, addClass } from 'vs/base/browser/dom';

src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts

@@ -5,7 +5,8 @@
 
 import 'vs/css!./media/processExplorer';
 import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
-import { NativeHostService, INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { localize } from 'vs/nls';
 import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';

src/vs/platform/native/electron-sandbox/native.ts

@@ -5,30 +5,7 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ICommonNativeHostService } from 'vs/platform/native/common/native';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
 
 export const INativeHostService = createDecorator<INativeHostService>('nativeHostService');
 
 export interface INativeHostService extends ICommonNativeHostService { }
-
-// @ts-ignore: interface is implemented via proxy
-export class NativeHostService implements INativeHostService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(
-		readonly windowId: number,
-		@IMainProcessService mainProcessService: IMainProcessService
-	) {
-		return createChannelSender<INativeHostService>(mainProcessService.getChannel('nativeHost'), {
-			context: windowId,
-			properties: (() => {
-				const properties = new Map<string, unknown>();
-				properties.set('windowId', windowId);
-
-				return properties;
-			})()
-		});
-	}
-}

src/vs/platform/native/electron-sandbox/nativeHostService.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
+import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
+
+// @ts-ignore: interface is implemented via proxy
+export class NativeHostService implements INativeHostService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		readonly windowId: number,
+		@IMainProcessService mainProcessService: IMainProcessService
+	) {
+		return createChannelSender<INativeHostService>(mainProcessService.getChannel('nativeHost'), {
+			context: windowId,
+			properties: (() => {
+				const properties = new Map<string, unknown>();
+				properties.set('windowId', windowId);
+
+				return properties;
+			})()
+		});
+	}
+}

src/vs/workbench/electron-browser/desktop.main.ts

@@ -48,7 +48,8 @@ import product from 'vs/platform/product/common/product';
 import { NativeResourceIdentityService } from 'vs/platform/resource/node/resourceIdentityServiceImpl';
 import { IResourceIdentityService } from 'vs/platform/resource/common/resourceIdentityService';
 import { NativeLogService } from 'vs/workbench/services/log/electron-browser/logService';
-import { INativeHostService, NativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
 
 class DesktopMain extends Disposable {
 

src/vs/workbench/electron-sandbox/desktop.main.ts

@@ -30,7 +30,8 @@ import { FileUserDataProvider } from 'vs/workbench/services/userData/common/file
 import { IProductService } from 'vs/platform/product/common/productService';
 import product from 'vs/platform/product/common/product';
 import { IResourceIdentityService } from 'vs/platform/resource/common/resourceIdentityService';
-import { INativeHostService, NativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService';
 import { SimpleConfigurationService, simpleFileSystemProvider, SimpleLogService, SimpleRemoteAgentService, SimpleResourceIdentityService, SimpleSignService, SimpleStorageService, SimpleWorkbenchEnvironmentService, SimpleWorkspaceService } from 'vs/workbench/electron-sandbox/sandbox.simpleservices';
 import { INativeWorkbenchConfiguration } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
 import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';