Commit 6d1da2c
committed
Use ptyHostService
Most of this was a straightforward replacement of our code with theirs
but I also removed `getDefaultShellAndArgs` since it seems the reference
implementation no longer does that either.
Fixes #2276.1 parent 2dcf098 commit 6d1da2c
4 files changed
Lines changed: 77 additions & 338 deletions
File tree
- lib/vscode/src/vs
- platform/terminal/node
- server/node
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -79,10 +79,7 @@ export class PtyService extends Disposable implements IPtyService { | |||
| 79 | 79 | throw new Error('Attempt to create a process when attach object was provided'); | |
| 80 | 80 | } | |
| 81 | 81 | const id = ++this._lastPtyId; | |
| 82 | - /** | ||
| 83 | - * NOTE@coder: pass ID into TerminalProcess to fix compile. | ||
| 84 | - */ | ||
| 85 | - const process = new TerminalProcess(id, shellLaunchConfig, cwd, cols, rows, env, executableEnv, windowsEnableConpty, this._logService); | ||
| 82 | + const process = new TerminalProcess(shellLaunchConfig, cwd, cols, rows, env, executableEnv, windowsEnableConpty, this._logService); | ||
| 86 | 83 | process.onProcessData(event => this._onProcessData.fire({ id, event })); | |
| 87 | 84 | process.onProcessExit(event => this._onProcessExit.fire({ id, event })); | |
| 88 | 85 | if (process.onProcessOverrideDimensions) { | |
Lines changed: 3 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -68,21 +68,16 @@ interface IWriteObject { | |||
| 68 | 68 | } | |
| 69 | 69 | ||
| 70 | 70 | export class TerminalProcess extends Disposable implements ITerminalChildProcess { | |
| 71 | + readonly id = 0; | ||
| 71 | 72 | readonly shouldPersist = false; | |
| 72 | 73 | ||
| 73 | 74 | private static _lastKillOrStart = 0; | |
| 74 | 75 | ||
| 75 | 76 | private _exitCode: number | undefined; | |
| 76 | 77 | private _exitMessage: string | undefined; | |
| 77 | 78 | private _closeTimeout: any; | |
| 78 | - /** | ||
| 79 | - * NOTE@coder: set _ptyProcess and _currentTitle to protected | ||
| 80 | - * to allow access from subclasses. | ||
| 81 | - * | ||
| 82 | - * We subclass it in src/vs/server/channel.ts | ||
| 83 | - */ | ||
| 84 | - protected _ptyProcess: pty.IPty | undefined; | ||
| 85 | - protected _currentTitle: string = ''; | ||
| 79 | + private _ptyProcess: pty.IPty | undefined; | ||
| 80 | + private _currentTitle: string = ''; | ||
| 86 | 81 | private _processStartupComplete: Promise<void> | undefined; | |
| 87 | 82 | private _isDisposed: boolean = false; | |
| 88 | 83 | private _windowsShellHelper: WindowsShellHelper | undefined; | |
@@ -111,9 +106,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess | |||
| 111 | 106 | private readonly _onProcessShellTypeChanged = this._register(new Emitter<TerminalShellType>()); | |
| 112 | 107 | public readonly onProcessShellTypeChanged = this._onProcessShellTypeChanged.event; | |
| 113 | 108 | ||
| 114 | - // NOTE@coder: add id to constructor | ||
| 115 | 109 | constructor( | |
| 116 | - public readonly id: number = 0, | ||
| 117 | 110 | private readonly _shellLaunchConfig: IShellLaunchConfig, | |
| 118 | 111 | cwd: string, | |
| 119 | 112 | cols: number, | |
0 commit comments