Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)

* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8

* Bump distro

* Upgrade GCC to 4.9 due to yarn install errors

* Update build image

* Fix bootstrap base url

* Bump distro

* Fix build errors

* Update source map file

* Disable checkbox for blocking migration issues (#15131)

* disable checkbox for blocking issues

* wip

* disable checkbox fixes

* fix strings

* Remove duplicate tsec command

* Default to off for tab color if settings not present

* re-skip failing tests

* Fix mocha error

* Bump sqlite version & fix notebooks search view

* Turn off esbuild warnings

* Update esbuild log level

* Fix overflowactionbar tests

* Fix ts-ignore in dropdown tests

* cleanup/fixes

* Fix hygiene

* Bundle in entire zone.js module

* Remove extra constructor param

* bump distro for web compile break

* bump distro for web compile break v2

* Undo log level change

* New distro

* Fix integration test scripts

* remove the "no yarn.lock changes" workflow

* fix scripts v2

* Update unit test scripts

* Ensure ads-kerberos2 updates in .vscodeignore

* Try fix unit tests

* Upload crash reports

* remove nogpu

* always upload crashes

* Use bash script

* Consolidate data/ext dir names

* Create in tmp directory

Co-authored-by: chlafreniere <hichise@gmail.com>
Co-authored-by: Christopher Suh <chsuh@microsoft.com>
Co-authored-by: chgagnon <chgagnon@microsoft.com>

src/vs/platform/ipc/electron-browser/sharedProcessService.ts

@@ -4,7 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { Event } from 'vs/base/common/event';
+import { IpcRendererEvent } from 'vs/base/parts/sandbox/electron-sandbox/electronTypes';
+import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
+import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
+import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
+import { generateUuid } from 'vs/base/common/uuid';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export const ISharedProcessService = createDecorator<ISharedProcessService>('sharedProcessService');
 
@@ -14,7 +22,47 @@ export interface ISharedProcessService {
 
 	getChannel(channelName: string): IChannel;
 	registerChannel(channelName: string, channel: IServerChannel<string>): void;
-
-	whenSharedProcessReady(): Promise<void>;
-	toggleSharedProcessWindow(): Promise<void>;
+}
+
+export class SharedProcessService extends Disposable implements ISharedProcessService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly withSharedProcessConnection: Promise<MessagePortClient>;
+
+	constructor(
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@ILogService private readonly logService: ILogService
+	) {
+		super();
+
+		this.withSharedProcessConnection = this.connect();
+	}
+
+	private async connect(): Promise<MessagePortClient> {
+		this.logService.trace('Renderer->SharedProcess#connect');
+
+		// Ask to create message channel inside the window
+		// and send over a UUID to correlate the response
+		const nonce = generateUuid();
+		ipcRenderer.send('vscode:createSharedProcessMessageChannel', nonce);
+
+		// Wait until the main side has returned the `MessagePort`
+		// We need to filter by the `nonce` to ensure we listen
+		// to the right response.
+		const onMessageChannelResult = Event.fromNodeEventEmitter<{ nonce: string, port: MessagePort }>(ipcRenderer, 'vscode:createSharedProcessMessageChannelResult', (e: IpcRendererEvent, nonce: string) => ({ nonce, port: e.ports[0] }));
+		const { port } = await Event.toPromise(Event.once(Event.filter(onMessageChannelResult, e => e.nonce === nonce)));
+
+		this.logService.trace('Renderer->SharedProcess#connect: connection established');
+
+		return this._register(new MessagePortClient(port, `window:${this.nativeHostService.windowId}`));
+	}
+
+	getChannel(channelName: string): IChannel {
+		return getDelayedChannel(this.withSharedProcessConnection.then(connection => connection.getChannel(channelName)));
+	}
+
+	registerChannel(channelName: string, channel: IServerChannel<string>): void {
+		this.withSharedProcessConnection.then(connection => connection.registerChannel(channelName, channel));
+	}
 }

src/vs/platform/ipc/electron-main/sharedProcessMainService.ts

@@ -1,36 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-
-export const ISharedProcessMainService = createDecorator<ISharedProcessMainService>('sharedProcessMainService');
-
-export interface ISharedProcessMainService {
-
-	readonly _serviceBrand: undefined;
-
-	whenSharedProcessReady(): Promise<void>;
-	toggleSharedProcessWindow(): Promise<void>;
-}
-
-export interface ISharedProcess {
-	whenReady(): Promise<void>;
-	toggle(): void;
-}
-
-export class SharedProcessMainService implements ISharedProcessMainService {
-
-	declare readonly _serviceBrand: undefined;
-
-	constructor(private sharedProcess: ISharedProcess) { }
-
-	whenSharedProcessReady(): Promise<void> {
-		return this.sharedProcess.whenReady();
-	}
-
-	async toggleSharedProcessWindow(): Promise<void> {
-		return this.sharedProcess.toggle();
-	}
-}

src/vs/platform/ipc/electron-sandbox/mainProcessService.ts

@@ -3,10 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
-import { Client } from 'vs/base/parts/ipc/electron-sandbox/ipc.electron-sandbox';
+import { IChannel, IServerChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
+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 as MessagePortServer } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
 
 export const IMainProcessService = createDecorator<IMainProcessService>('mainProcessService');
 
@@ -19,18 +20,21 @@ export interface IMainProcessService {
 	registerChannel(channelName: string, channel: IServerChannel<string>): void;
 }
 
-export class MainProcessService extends Disposable implements IMainProcessService {
+/**
+ * An implementation of `IMainProcessService` that leverages Electron's IPC.
+ */
+export class ElectronIPCMainProcessService extends Disposable implements IMainProcessService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private mainProcessConnection: Client;
+	private mainProcessConnection: IPCElectronClient;
 
 	constructor(
 		windowId: number
 	) {
 		super();
 
-		this.mainProcessConnection = this._register(new Client(`window:${windowId}`));
+		this.mainProcessConnection = this._register(new IPCElectronClient(`window:${windowId}`));
 	}
 
 	getChannel(channelName: string): IChannel {
@@ -41,3 +45,24 @@ export class MainProcessService extends Disposable implements IMainProcessServic
 		this.mainProcessConnection.registerChannel(channelName, channel);
 	}
 }
+
+/**
+ * An implementation of `IMainProcessService` that leverages MessagePorts.
+ */
+export class MessagePortMainProcessService implements IMainProcessService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		private server: MessagePortServer,
+		private router: StaticRouter
+	) { }
+
+	getChannel(channelName: string): IChannel {
+		return this.server.getChannel(channelName, this.router);
+	}
+
+	registerChannel(channelName: string, channel: IServerChannel<string>): void {
+		this.server.registerChannel(channelName, channel);
+	}
+}