From 9e1863ec2dce4a7e1fff93a697c4fe00e7dbb2f0 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 15 Jan 2021 08:45:35 +0100 Subject: [PATCH] shared process - :lipstick: --- .../code/electron-browser/sharedProcess/sharedProcessMain.ts | 4 ++-- src/vs/code/electron-main/sharedProcess.ts | 2 ++ src/vs/code/electron-sandbox/workbench/workbench.js | 2 +- src/vs/platform/ipc/electron-sandbox/mainProcessService.ts | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index a2f8b2961b2..f0b2d6096a7 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -188,12 +188,12 @@ class SharedProcessMain extends Disposable { services.set(IDownloadService, new SyncDescriptor(DownloadService)); // Extension recommendations - const activeWindowManager = new ActiveWindowManager(nativeHostService); + const activeWindowManager = this._register(new ActiveWindowManager(nativeHostService)); const activeWindowRouter = new StaticRouter(ctx => activeWindowManager.getActiveClientId().then(id => ctx === id)); services.set(IExtensionRecommendationNotificationService, new ExtensionRecommendationNotificationServiceChannelClient(this.server.getChannel('extensionRecommendationNotification', activeWindowRouter))); // Logger - const loggerService = new LoggerService(logService, fileService); + const loggerService = this._register(new LoggerService(logService, fileService)); services.set(ILoggerService, loggerService); // Telemetry diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts index 074dd5b6d7f..12e1539123b 100644 --- a/src/vs/code/electron-main/sharedProcess.ts +++ b/src/vs/code/electron-main/sharedProcess.ts @@ -44,6 +44,8 @@ export class SharedProcess extends Disposable implements ISharedProcess { // Shared process connections ipcMain.on('vscode:createSharedProcessMessageChannel', async (e, nonce: string) => { + this.logService.trace('SharedProcess: on vscode:createSharedProcessMessageChannel'); + const port = await this.connect(); e.sender.postMessage('vscode:createSharedProcessMessageChannelResult', nonce, [port]); diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js index 34ffb7b3dfb..10eb9ab9fae 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench.js +++ b/src/vs/code/electron-sandbox/workbench/workbench.js @@ -23,7 +23,7 @@ 'vs/nls!vs/workbench/workbench.desktop.main', 'vs/css!vs/workbench/workbench.desktop.main' ], - function (workbench, configuration) { + function (_, configuration) { // Mark start of workbench performance.mark('code/didLoadWorkbenchMain'); diff --git a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts index ef17fe1cfe6..2f326523ce5 100644 --- a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts +++ b/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts @@ -7,7 +7,7 @@ import { IChannel, IServerChannel, StaticRouter } from 'vs/base/parts/ipc/common import { Client as IPCElectronClient } from 'vs/base/parts/ipc/electron-sandbox/ipc.electron'; import { Disposable } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { Server } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp'; +import { Server as MessagePortServer } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp'; export const IMainProcessService = createDecorator('mainProcessService'); @@ -54,7 +54,7 @@ export class MessagePortMainProcessService implements IMainProcessService { declare readonly _serviceBrand: undefined; constructor( - private server: Server, + private server: MessagePortServer, private router: StaticRouter ) { }