Skip to content

fix: guard terminal resize against disposal to prevent xterm dimensions error (fixes #316419) #316424

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

Open
vs-code-engineering wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −1
Open

fix: guard terminal resize against disposal to prevent xterm dimensions error (fixes #316419) #316424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private _latestXtermWriteData: number = 0;
private _latestXtermParseData: number = 0;
private _isExiting: boolean;
private _isDisposing: boolean;
private _hadFocusOnExit: boolean;
private _exitCode: number | undefined;
private _exitReason: TerminalExitReason | undefined;
Expand Down Expand Up @@ -413,6 +414,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
this._widgetManager = this._register(instantiationService.createInstance(TerminalWidgetManager));

this._isExiting = false;
this._isDisposing = false;
this._hadFocusOnExit = false;
this._isVisible = false;
this._instanceId = TerminalInstance._instanceIdCounter++;
Expand Down Expand Up @@ -1292,6 +1294,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
return;
}
this._logService.trace(`terminalInstance#dispose (instanceId: ${this.instanceId})`);
this._isDisposing = true;
dispose(this._widgetManager);

if (this.xterm?.raw.element) {
Expand Down Expand Up @@ -2019,7 +2022,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
}

private async _resize(immediate?: boolean): Promise<void> {
if (!this.xterm) {
if (!this.xterm || this.isDisposed || this._isDisposing) {
return;
}

Expand Down
Loading