-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move terminal instance service methods to local terminal service
Part of #116467
- Loading branch information
Showing
6 changed files
with
173 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalService.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { Emitter } from 'vs/base/common/event'; | ||
| import { Disposable } from 'vs/base/common/lifecycle'; | ||
| import { IProcessEnvironment } from 'vs/base/common/platform'; | ||
| import { localize } from 'vs/nls'; | ||
| import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; | ||
| import { ILabelService } from 'vs/platform/label/common/label'; | ||
| import { ILogService } from 'vs/platform/log/common/log'; | ||
| import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification'; | ||
| import { ILocalTerminalService, IShellLaunchConfig, ITerminalChildProcess, ITerminalsLayoutInfo, ITerminalsLayoutInfoById } from 'vs/platform/terminal/common/terminal'; | ||
| import { IGetTerminalLayoutInfoArgs, ISetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess'; | ||
| import { ILocalPtyService } from 'vs/platform/terminal/electron-sandbox/terminal'; | ||
| import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; | ||
| import { LocalPty } from 'vs/workbench/contrib/terminal/electron-sandbox/localPty'; | ||
|
|
||
| export class LocalTerminalService extends Disposable implements ILocalTerminalService { | ||
| public _serviceBrand: undefined; | ||
|
|
||
| private readonly _ptys: Map<number, LocalPty> = new Map(); | ||
|
|
||
| private readonly _onPtyHostExit = this._register(new Emitter<void>()); | ||
| readonly onPtyHostExit = this._onPtyHostExit.event; | ||
| private readonly _onPtyHostUnresponsive = this._register(new Emitter<void>()); | ||
| readonly onPtyHostUnresponsive = this._onPtyHostUnresponsive.event; | ||
|
|
||
| constructor( | ||
| @IInstantiationService private readonly _instantiationService: IInstantiationService, | ||
| @IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService, | ||
| @ILogService private readonly _logService: ILogService, | ||
| @ILocalPtyService private readonly _localPtyService: ILocalPtyService, | ||
| @ILabelService private readonly _labelService: ILabelService, | ||
| @INotificationService notificationService: INotificationService | ||
| ) { | ||
| super(); | ||
|
|
||
| // Attach process listeners | ||
| this._localPtyService.onProcessData(e => this._ptys.get(e.id)?.handleData(e.event)); | ||
| this._localPtyService.onProcessExit(e => { | ||
| const pty = this._ptys.get(e.id); | ||
| if (pty) { | ||
| pty.handleExit(e.event); | ||
| this._ptys.delete(e.id); | ||
| } | ||
| }); | ||
| this._localPtyService.onProcessReady(e => this._ptys.get(e.id)?.handleReady(e.event)); | ||
| this._localPtyService.onProcessTitleChanged(e => this._ptys.get(e.id)?.handleTitleChanged(e.event)); | ||
| this._localPtyService.onProcessOverrideDimensions(e => this._ptys.get(e.id)?.handleOverrideDimensions(e.event)); | ||
| this._localPtyService.onProcessResolvedShellLaunchConfig(e => this._ptys.get(e.id)?.handleResolvedShellLaunchConfig(e.event)); | ||
| this._localPtyService.onProcessReplay(e => this._ptys.get(e.id)?.handleReplay(e.event)); | ||
|
|
||
| // Attach pty host listeners | ||
| if (this._localPtyService.onPtyHostExit) { | ||
| this._localPtyService.onPtyHostExit(e => { | ||
| this._onPtyHostExit.fire(); | ||
| notificationService.error(`The terminal's pty host process exited, the connection to all terminal processes was lost`); | ||
| }); | ||
| } | ||
| if (this._localPtyService.onPtyHostStart) { | ||
| this._localPtyService.onPtyHostStart(() => { | ||
| this._logService.info(`ptyHost restarted`); | ||
| }); | ||
| } | ||
| if (this._localPtyService.onPtyHostUnresponsive) { | ||
| this._localPtyService.onPtyHostUnresponsive(() => { | ||
| const choices: IPromptChoice[] = [{ | ||
| label: localize('restartPtyHost', "Restart pty host"), | ||
| run: () => this._localPtyService.restartPtyHost!() | ||
| }]; | ||
| notificationService.prompt(Severity.Error, localize('nonResponsivePtyHost', "The connection to the terminal's pty host process is unresponsive, the terminals may stop working."), choices); | ||
| this._onPtyHostUnresponsive.fire(); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public async createTerminalProcess(shellLaunchConfig: IShellLaunchConfig, cwd: string, cols: number, rows: number, env: IProcessEnvironment, windowsEnableConpty: boolean, shouldPersist: boolean): Promise<ITerminalChildProcess> { | ||
| const id = await this._localPtyService.createProcess(shellLaunchConfig, cwd, cols, rows, env, process.env as IProcessEnvironment, windowsEnableConpty, shouldPersist, this._getWorkspaceId(), this._getWorkspaceName()); | ||
| const pty = this._instantiationService.createInstance(LocalPty, id, shouldPersist); | ||
| this._ptys.set(id, pty); | ||
| return pty; | ||
| } | ||
|
|
||
| public async attachToProcess(id: number): Promise<ITerminalChildProcess | undefined> { | ||
| try { | ||
| await this._localPtyService.attachToProcess(id); | ||
| const pty = this._instantiationService.createInstance(LocalPty, id, true); | ||
| this._ptys.set(id, pty); | ||
| return pty; | ||
| } catch (e) { | ||
| this._logService.trace(`Couldn't attach to process ${e.message}`); | ||
| } | ||
| return undefined; | ||
| } | ||
|
|
||
| public setTerminalLayoutInfo(layoutInfo?: ITerminalsLayoutInfoById): void { | ||
| const args: ISetTerminalLayoutInfoArgs = { | ||
| workspaceId: this._getWorkspaceId(), | ||
| tabs: layoutInfo ? layoutInfo.tabs : [] | ||
| }; | ||
| this._localPtyService.setTerminalLayoutInfo(args); | ||
| } | ||
|
|
||
| public async getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined> { | ||
| const layoutArgs: IGetTerminalLayoutInfoArgs = { | ||
| workspaceId: this._getWorkspaceId() | ||
| }; | ||
| let result = await this._localPtyService.getTerminalLayoutInfo(layoutArgs); | ||
| return result; | ||
| } | ||
|
|
||
| private _getWorkspaceId(): string { | ||
| return this._workspaceContextService.getWorkspace().id; | ||
| } | ||
|
|
||
| private _getWorkspaceName(): string { | ||
| return this._labelService.getWorkspaceLabel(this._workspaceContextService.getWorkspace()); | ||
| } | ||
| } |