development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181412 from microsoft/merogge/disp-term

Browse source 
move terminal disposal to `_onWillShutdown`
This commit is contained in:
Megan Rogge 2023-05-03 10:12:25 -07:00 committed by GitHub
parent c621b7adeb 9a0265ce11
commit df07691231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/vs/workbench/contrib/terminal/browser/terminalService.ts
View file

@ -566,11 +566,6 @@ export class TerminalService implements ITerminalService {
}
private async _onBeforeShutdownAsync(reason: ShutdownReason): Promise<boolean> {
if (this._backgroundedTerminalInstances.length) {
for (const terminal of this._backgroundedTerminalInstances.filter(b => !b.shouldPersist)) {
terminal.dispose();
}
}
if (this.instances.length === 0) {
// No terminal instances, don't veto
return false;
@ -656,20 +651,17 @@ export class TerminalService implements ITerminalService {
private _onWillShutdown(e: WillShutdownEvent): void {
// Don't touch processes if the shutdown was a result of reload as they will be reattached
const shouldPersistTerminals = this._configHelper.config.enablePersistentSessions && e.reason === ShutdownReason.RELOAD;
if (shouldPersistTerminals) {
for (const instance of this._terminalGroupService.instances) {
instance.detachProcessAndDispose(TerminalExitReason.Shutdown);
}
return;
}
// Force dispose of all pane terminal instances
for (const instance of this._terminalGroupService.instances) {
instance.dispose(TerminalExitReason.Shutdown);
for (const instance of [...this._terminalGroupService.instances, ...this._backgroundedTerminalInstances]) {
if (shouldPersistTerminals && instance.shouldPersist) {
instance.detachProcessAndDispose(TerminalExitReason.Shutdown);
} else {
instance.dispose(TerminalExitReason.Shutdown);
}
}
// Clear terminal layout info only when not persisting
if (!this._shouldReviveProcesses(e.reason)) {
if (!shouldPersistTerminals && !this._shouldReviveProcesses(e.reason)) {
this._primaryBackend?.setTerminalLayoutInfo(undefined);
}
}