From d3bb6d7a9c5edac74ddde6a7fdb06eba6fc66ace Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 17 Jan 2022 16:53:58 +0100
Subject: [PATCH] :lipstick:

---
 .../issue/issueReporterMain.ts                | 21 ++++++-------------
 .../processExplorer/processExplorerMain.ts    |  8 +++----
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
index fcd44854ede..4fb10a1b5f3 100644
--- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
@@ -3,9 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import 'vs/css!./media/issueReporter';
+import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
+import { localize } from 'vs/nls';
 import { $, reset, safeInnerHtml, windowOpenNoOpener } from 'vs/base/browser/dom';
 import { Button } from 'vs/base/browser/ui/button/button';
-import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
 import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { Delayer } from 'vs/base/common/async';
 import { Codicon } from 'vs/base/common/codicons';
@@ -17,12 +19,9 @@ import { escape } from 'vs/base/common/strings';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { IssueReporterData as IssueReporterModelData, IssueReporterModel } from 'vs/code/electron-sandbox/issue/issueReporterModel';
 import BaseHtml from 'vs/code/electron-sandbox/issue/issueReporterPage';
-import 'vs/css!./media/issueReporter';
-import { localize } from 'vs/nls';
 import { isRemoteDiagnosticError, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services';
+
 import { IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IssueReporterWindowConfiguration, IssueType } from 'vs/platform/issue/common/issue';
 import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
@@ -70,7 +69,8 @@ export class IssueReporter extends Disposable {
 	constructor(private readonly configuration: IssueReporterWindowConfiguration) {
 		super();
 
-		this.initServices(configuration);
+		const mainProcessService = new ElectronIPCMainProcessService(configuration.windowId);
+		this.nativeHostService = new NativeHostService(configuration.windowId, mainProcessService) as INativeHostService;
 
 		const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id === configuration.data.extensionId) : undefined;
 		this.issueReporterModel = new IssueReporterModel({
@@ -255,15 +255,6 @@ export class IssueReporter extends Disposable {
 		this.updateExtensionSelector(installedExtensions);
 	}
 
-	private initServices(configuration: IssueReporterWindowConfiguration): void {
-		const serviceCollection = new ServiceCollection();
-		const mainProcessService = new ElectronIPCMainProcessService(configuration.windowId);
-		serviceCollection.set(IMainProcessService, mainProcessService);
-
-		this.nativeHostService = new NativeHostService(configuration.windowId, mainProcessService) as INativeHostService;
-		serviceCollection.set(INativeHostService, this.nativeHostService);
-	}
-
 	private setEventHandlers(): void {
 		this.addEventListener('issue-type', 'change', (event: Event) => {
 			const issueType = parseInt((<HTMLInputElement>event.target).value);
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
index 5514d4610a3..fad45e92474 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts
@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, append, createStyleSheet } from 'vs/base/browser/dom';
+import 'vs/css!./media/processExplorer';
 import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
+import { localize } from 'vs/nls';
+import { $, append, createStyleSheet } from 'vs/base/browser/dom';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
 import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
@@ -13,8 +15,6 @@ import { ProcessItem } from 'vs/base/common/processes';
 import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
 import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
 import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
-import 'vs/css!./media/processExplorer';
-import { localize } from 'vs/nls';
 import { IRemoteDiagnosticError, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
 import { ByteSize } from 'vs/platform/files/common/files';
 import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
@@ -265,8 +265,6 @@ class ProcessExplorer {
 		this.lastRequestTime = Date.now();
 		ipcRenderer.send('vscode:windowsInfoRequest');
 		ipcRenderer.send('vscode:listProcesses');
-
-
 	}
 
 	private setEventHandlers(data: ProcessExplorerData): void {