Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug with hanged pseudoterminal #84181

Merged
merged 10 commits into from
Nov 19, 2019
Merged

Fix bug with hanged pseudoterminal #84181

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c60c6c1
Fix bug with hanged pseudoterminal
solomatov Nov 8, 2019
bde2d42
Code review comments
solomatov Nov 8, 2019
ed52435
Fixing tests
solomatov Nov 8, 2019
794ed4f
Fixed test
solomatov Nov 8, 2019
1004d51
Merge branch 'master' into pty_bug
Tyriar Nov 17, 2019
6d7f763
Only set _extensionTerminalAwaitingStart when deferred start is needed
Tyriar Nov 17, 2019
f329ef3
Merge dimensions into awaiting object
Tyriar Nov 17, 2019
649ef05
Fix ws
Tyriar Nov 17, 2019
8848a0d
Merge branch 'master' into pty_bug
Tyriar Nov 18, 2019
7a18410
Merge remote-tracking branch 'upstream/master' into pty_bug
solomatov Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/vs/workbench/api/common/extHostTerminalService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,14 +456,18 @@ export abstract class BaseExtHostTerminalService implements IExtHostTerminalServ
// Processes should be initialized here for normal virtual process terminals, however for
// tasks they are responsible for attaching the virtual process to a terminal so this
// function may be called before tasks is able to attach to the terminal.
let retries = 5;
let retries = 8;
let currentTimeout = 50;
while (retries-- > 0) {
if (this._terminalProcesses[id]) {
solomatov marked this conversation as resolved.
Show resolved Hide resolved
(this._terminalProcesses[id] as ExtHostPseudoterminal).startSendingEvents(initialDimensions);
return;
}
await timeout(50);
await timeout(currentTimeout);
currentTimeout *= 2;
}

throw new Error('Wasn\'t able to start extension terminal');
}

protected _setupExtHostProcessListeners(id: number, p: ITerminalChildProcess): void {
Expand Down