diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 659cd1e9490..014a199a1a3 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -1325,7 +1325,7 @@ declare module 'vscode' { * writeEmitter.fire('\x1b[10;20H*'); * ``` */ - write: Event; + onDidWrite: Event; /** * An event that when fired allows overriding the [dimensions](#Terminal.dimensions) of the @@ -1347,13 +1347,13 @@ declare module 'vscode' { * }); * ``` */ - overrideDimensions?: Event; + onDidOverrideDimensions?: Event; /** * An event that when fired will exit the process with an exit code, this will behave the * same for a virtual process as when a regular process exits with an exit code. */ - exit?: Event; + onDidExit?: Event; /** * Implement to handle keystrokes in the terminal or when an extension calls @@ -1367,13 +1367,13 @@ declare module 'vscode' { * ```typescript * const writeEmitter = new vscode.EventEmitter(); * const virtualProcess: TerminalVirtualProcess = { - * write: writeEmitter.event, - * onDidAcceptInput: data => writeEmitter.fire(data === '\r' ? '\r\n' : data); + * onDidWrite: writeEmitter.event, + * input: data => writeEmitter.fire(data === '\r' ? '\r\n' : data); * }; * vscode.window.createTerminal({ name: 'Local echo', virtualProcess }); * ``` */ - onDidAcceptInput?(data: string): void; + input?(data: string): void; /** * Implement to handle when the number of rows and columns that fit into the terminal panel @@ -1383,12 +1383,12 @@ declare module 'vscode' { * * @param dimensions The new dimensions. */ - onDidChangeDimensions?(dimensions: TerminalDimensions): void; + setDimensions?(dimensions: TerminalDimensions): void; /** * Implement to handle when the terminal shuts down by an act of the user. */ - onDidShutdownTerminal?(): void; + shutdown?(): void; } //#endregion diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 0605a48b680..71d4a0d0faf 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -730,30 +730,30 @@ class ExtHostVirtualProcess implements ITerminalChildProcess { private readonly _virtualProcess: vscode.TerminalVirtualProcess ) { this._queueDisposables = []; - this._queueDisposables.push(this._virtualProcess.write(e => this._queuedEvents.push({ emitter: this._onProcessData, data: e }))); - if (this._virtualProcess.exit) { - this._queueDisposables.push(this._virtualProcess.exit(e => this._queuedEvents.push({ emitter: this._onProcessExit, data: e }))); + this._queueDisposables.push(this._virtualProcess.onDidWrite(e => this._queuedEvents.push({ emitter: this._onProcessData, data: e }))); + if (this._virtualProcess.onDidExit) { + this._queueDisposables.push(this._virtualProcess.onDidExit(e => this._queuedEvents.push({ emitter: this._onProcessExit, data: e }))); } - if (this._virtualProcess.overrideDimensions) { - this._queueDisposables.push(this._virtualProcess.overrideDimensions(e => this._queuedEvents.push({ emitter: this._onProcessOverrideDimensions, data: e ? { cols: e.columns, rows: e.rows } : undefined }))); + if (this._virtualProcess.onDidOverrideDimensions) { + this._queueDisposables.push(this._virtualProcess.onDidOverrideDimensions(e => this._queuedEvents.push({ emitter: this._onProcessOverrideDimensions, data: e ? { cols: e.columns, rows: e.rows } : undefined }))); } } shutdown(): void { - if (this._virtualProcess.onDidShutdownTerminal) { - this._virtualProcess.onDidShutdownTerminal(); + if (this._virtualProcess.shutdown) { + this._virtualProcess.shutdown(); } } input(data: string): void { - if (this._virtualProcess.onDidAcceptInput) { - this._virtualProcess.onDidAcceptInput(data); + if (this._virtualProcess.acceptInput) { + this._virtualProcess.acceptInput(data); } } resize(cols: number, rows: number): void { - if (this._virtualProcess.onDidChangeDimensions) { - this._virtualProcess.onDidChangeDimensions({ columns: cols, rows }); + if (this._virtualProcess.setDimensions) { + this._virtualProcess.setDimensions({ columns: cols, rows }); } } @@ -776,12 +776,12 @@ class ExtHostVirtualProcess implements ITerminalChildProcess { this._queueDisposables = undefined; // Attach the real listeners - this._virtualProcess.write(e => this._onProcessData.fire(e)); - if (this._virtualProcess.exit) { - this._virtualProcess.exit(e => this._onProcessExit.fire(e)); + this._virtualProcess.onDidWrite(e => this._onProcessData.fire(e)); + if (this._virtualProcess.onDidExit) { + this._virtualProcess.onDidExit(e => this._onProcessExit.fire(e)); } - if (this._virtualProcess.overrideDimensions) { - this._virtualProcess.overrideDimensions(e => this._onProcessOverrideDimensions.fire(e ? { cols: e.columns, rows: e.rows } : e)); + if (this._virtualProcess.onDidOverrideDimensions) { + this._virtualProcess.onDidOverrideDimensions(e => this._onProcessOverrideDimensions.fire(e ? { cols: e.columns, rows: e.rows } : e)); } } }