daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #186740 from microsoft/tyriar/186737 

Remove native private fields from terminal/
pull/186750/head
Daniel Imms 2023-06-30 07:41:10 -07:00 committed by GitHub
parent 477558f395 1362a5634d
commit 082cc53c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/workbench/services/terminal/common/embedderTerminalService.ts
View File

@ -3,8 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/* eslint-disable local/code-no-native-private */
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { Emitter, Event } from 'vs/base/common/event';
@ -74,17 +72,17 @@ class EmbedderTerminalService implements IEmbedderTerminalService {
class EmbedderTerminalProcess extends Disposable implements ITerminalChildProcess {
readonly #pty: IEmbedderTerminalPty;
private readonly _pty: IEmbedderTerminalPty;
readonly shouldPersist = false;
readonly onProcessData: Event<IProcessDataEvent | string>;
readonly #onProcessReady = this._register(new Emitter<IProcessReadyEvent>());
readonly onProcessReady = this.#onProcessReady.event;
readonly #onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
readonly onDidChangeProperty = this.#onDidChangeProperty.event;
readonly #onProcessExit = this._register(new Emitter<number | undefined>());
readonly onProcessExit = this.#onProcessExit.event;
private readonly _onProcessReady = this._register(new Emitter<IProcessReadyEvent>());
readonly onProcessReady = this._onProcessReady.event;
private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
readonly onDidChangeProperty = this._onDidChangeProperty.event;
private readonly _onProcessExit = this._register(new Emitter<number | undefined>());
readonly onProcessExit = this._onProcessExit.event;
constructor(
readonly id: number,
@ -92,13 +90,13 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
) {
super();
this.#pty = pty;
this.onProcessData = this.#pty.onDidWrite;
if (this.#pty.onDidClose) {
this._register(this.#pty.onDidClose(e => this.#onProcessExit.fire(e || undefined)));
this._pty = pty;
this.onProcessData = this._pty.onDidWrite;
if (this._pty.onDidClose) {
this._register(this._pty.onDidClose(e => this._onProcessExit.fire(e || undefined)));
}
if (this.#pty.onDidChangeName) {
this._register(this.#pty.onDidChangeName(e => this.#onDidChangeProperty.fire({
if (this._pty.onDidChangeName) {
this._register(this._pty.onDidChangeName(e => this._onDidChangeProperty.fire({
type: ProcessPropertyType.Title,
value: e
})));
@ -106,12 +104,12 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
}
async start(): Promise<ITerminalLaunchError | undefined> {
this.#onProcessReady.fire({ pid: -1, cwd: '', windowsPty: undefined });
this.#pty.open();
this._onProcessReady.fire({ pid: -1, cwd: '', windowsPty: undefined });
this._pty.open();
return undefined;
}
shutdown(): void {
this.#pty.close();
this._pty.close();
}
// TODO: A lot of these aren't useful for some implementations of ITerminalChildProcess, should