From 4ea18e96151a24e88f7bdac3c8dfd2b13712b901 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 10 Feb 2021 15:44:14 -0800 Subject: [PATCH] Remove unneeded file, document channels --- src/vs/base/parts/ipc/common/ipc.ts | 1 - .../sharedProcess/sharedProcessMain.ts | 2 -- src/vs/platform/terminal/common/terminal.ts | 9 ++++- .../electron-browser/localPtyService.ts | 4 +-- .../terminal/electron-browser/terminalIpc.ts | 33 ------------------- .../terminal/node/ptyHost/ptyHostMain.ts | 3 +- .../terminal/node/ptyHost/ptyService.ts | 1 - 7 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 src/vs/platform/terminal/electron-browser/terminalIpc.ts diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts index 70a82ac3998..0757b52ab81 100644 --- a/src/vs/base/parts/ipc/common/ipc.ts +++ b/src/vs/base/parts/ipc/common/ipc.ts @@ -1066,7 +1066,6 @@ export namespace ProxyChannel { return new class implements IServerChannel { listen(_: unknown, event: string): Event { - console.log('fromService listen', event); const eventImpl = mapEventNameToEvent.get(event); if (eventImpl) { return eventImpl as Event; diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index f2dd691e3e5..47ee3460726 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -81,7 +81,6 @@ import { DeprecatedExtensionsCleaner } from 'vs/code/electron-browser/sharedProc import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { join } from 'vs/base/common/path'; -import { LocalPtyChannel } from 'vs/platform/terminal/electron-browser/terminalIpc'; import { TerminalIpcChannels } from 'vs/platform/terminal/common/terminal'; import { LocalPtyService } from 'vs/platform/terminal/electron-browser/localPtyService'; import { ILocalPtyService } from 'vs/platform/terminal/electron-sandbox/terminal'; @@ -264,7 +263,6 @@ class SharedProcessMain extends Disposable { services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService)); // Terminal - // TODO: Move out of electron-main services.set(ILocalPtyService, new SyncDescriptor(LocalPtyService)); return new InstantiationService(services); diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts index a55af3de2c1..679136eb734 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -8,7 +8,14 @@ import { IProcessEnvironment } from 'vs/base/common/platform'; import { URI } from 'vs/base/common/uri'; export enum TerminalIpcChannels { - LocalPty = 'localPty' + /** + * Communicates between the renderer process and shared process. + */ + LocalPty = 'localPty', + /** + * Communicates between the shared process and the pty host process. + */ + PtyHost = 'ptyHost' } export interface ILocalPtyService { diff --git a/src/vs/platform/terminal/electron-browser/localPtyService.ts b/src/vs/platform/terminal/electron-browser/localPtyService.ts index c3571957f92..86a72cc35ba 100644 --- a/src/vs/platform/terminal/electron-browser/localPtyService.ts +++ b/src/vs/platform/terminal/electron-browser/localPtyService.ts @@ -5,7 +5,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { ILogService } from 'vs/platform/log/common/log'; -import { ILocalPtyService, IProcessDataEvent, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError } from 'vs/platform/terminal/common/terminal'; +import { ILocalPtyService, IProcessDataEvent, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, TerminalIpcChannels } from 'vs/platform/terminal/common/terminal'; import { Client } from 'vs/base/parts/ipc/node/ipc.cp'; import { FileAccess } from 'vs/base/common/network'; import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; @@ -65,7 +65,7 @@ export class LocalPtyService extends Disposable implements ILocalPtyService { // } })); - this._proxy = ProxyChannel.toService(client.getChannel('ptyHost')); + this._proxy = ProxyChannel.toService(client.getChannel(TerminalIpcChannels.PtyHost)); this._register(this._proxy.onProcessData(e => this._onProcessData.fire(e))); this._register(this._proxy.onProcessExit(e => this._onProcessExit.fire(e))); this._register(this._proxy.onProcessReady(e => this._onProcessReady.fire(e))); diff --git a/src/vs/platform/terminal/electron-browser/terminalIpc.ts b/src/vs/platform/terminal/electron-browser/terminalIpc.ts deleted file mode 100644 index a5cb7012547..00000000000 --- a/src/vs/platform/terminal/electron-browser/terminalIpc.ts +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { Event } from 'vs/base/common/event'; -import { Disposable } from 'vs/base/common/lifecycle'; -import { IServerChannel } from 'vs/base/parts/ipc/common/ipc'; -import { ILocalPtyService } from 'vs/platform/terminal/common/terminal'; - -export class LocalPtyChannel extends Disposable implements IServerChannel { - constructor( - private readonly _localPtyService: ILocalPtyService - ) { - super(); - } - - listen(_: unknown, event: string): Event { - console.log('LocalPtyChannel listen ' + event); - throw new Error(`Event not found: ${event}`); - } - - async call(_: unknown, command: string, arg?: any): Promise { - switch (command) { - case 'createProcess': return this._localPtyService.createProcess(...arg as [any, any, any, any, any, any, any]); - case 'start': return this._localPtyService.start(...(arg as [any])); - // TODO: Fill in other calls - - default: - throw new Error(`Call not found: ${command}`); - } - } -} diff --git a/src/vs/platform/terminal/node/ptyHost/ptyHostMain.ts b/src/vs/platform/terminal/node/ptyHost/ptyHostMain.ts index be3b5cb0e44..6a20343e49c 100644 --- a/src/vs/platform/terminal/node/ptyHost/ptyHostMain.ts +++ b/src/vs/platform/terminal/node/ptyHost/ptyHostMain.ts @@ -6,7 +6,8 @@ import { Server } from 'vs/base/parts/ipc/node/ipc.cp'; import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; import { PtyService } from 'vs/platform/terminal/node/ptyHost/ptyService'; +import { TerminalIpcChannels } from 'vs/platform/terminal/common/terminal'; const server = new Server('ptyHost'); const service = new PtyService(); -server.registerChannel('ptyHost', ProxyChannel.fromService(service)); +server.registerChannel(TerminalIpcChannels.PtyHost, ProxyChannel.fromService(service)); diff --git a/src/vs/platform/terminal/node/ptyHost/ptyService.ts b/src/vs/platform/terminal/node/ptyHost/ptyService.ts index 22587321df8..3c7460ad160 100644 --- a/src/vs/platform/terminal/node/ptyHost/ptyService.ts +++ b/src/vs/platform/terminal/node/ptyHost/ptyService.ts @@ -37,7 +37,6 @@ export class PtyService extends Disposable implements ILocalPtyService { async createProcess(shellLaunchConfig: IShellLaunchConfig, cwd: string, cols: number, rows: number, env: IProcessEnvironment, executableEnv: IProcessEnvironment, windowsEnableConpty: boolean): Promise { const id = ++currentPtyId; - console.log('PtyMainService#createProcess ' + id, shellLaunchConfig, cwd, cols); // TODO: Impl proper logging, level doesn't get passed over const process = new TerminalProcess(shellLaunchConfig, cwd, cols, rows, env, executableEnv, windowsEnableConpty, new LogService(new ConsoleLogger())); process.onProcessData(event => this._onProcessData.fire({ id, event }));