maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't remove terminal tabs on shutdown

Browse source 
Part of #127340
This commit is contained in:
Daniel Imms 2021-07-07 04:50:18 -07:00
parent 789539d304
commit 8d4333a942
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
View file

@ -43,6 +43,7 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { containsDragType } from 'vs/workbench/browser/dnd';
import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings';
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
const $ = DOM.$;
@ -72,7 +73,8 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
@IInstantiationService instantiationService: IInstantiationService,
@IDecorationsService decorationsService: IDecorationsService,
@IThemeService private readonly _themeService: IThemeService
@IThemeService private readonly _themeService: IThemeService,
@ILifecycleService lifecycleService: ILifecycleService,
) {
super('TerminalTabsList', container,
{
@ -99,20 +101,29 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
_configurationService,
keybindingService,
);
this._terminalGroupService.onDidChangeInstances(() => this.refresh());
this._terminalGroupService.onDidChangeGroups(() => this.refresh());
this._terminalService.onDidChangeInstanceTitle(() => this.refresh());
this._terminalService.onDidChangeInstanceIcon(() => this.refresh());
this._terminalService.onDidChangeInstancePrimaryStatus(() => this.refresh());
this._terminalService.onDidChangeConnectionState(() => this.refresh());
this._themeService.onDidColorThemeChange(() => this.refresh());
this._terminalGroupService.onDidChangeActiveInstance(e => {
if (e) {
const i = this._terminalGroupService.instances.indexOf(e);
this.setSelection([i]);
this.reveal(i);
}
this.refresh();
const instanceDisposables: IDisposable[] = [
this._terminalGroupService.onDidChangeInstances(() => this.refresh()),
this._terminalGroupService.onDidChangeGroups(() => this.refresh()),
this._terminalService.onDidChangeInstanceTitle(() => this.refresh()),
this._terminalService.onDidChangeInstanceIcon(() => this.refresh()),
this._terminalService.onDidChangeInstancePrimaryStatus(() => this.refresh()),
this._terminalService.onDidChangeConnectionState(() => this.refresh()),
this._themeService.onDidColorThemeChange(() => this.refresh()),
this._terminalGroupService.onDidChangeActiveInstance(e => {
if (e) {
const i = this._terminalGroupService.instances.indexOf(e);
this.setSelection([i]);
this.reveal(i);
}
this.refresh();
})
];
// Dispose of instance listeners on shutdown to avoid extra work and so tabs don't disappear
// briefly
lifecycleService.onWillShutdown(e => {
dispose(instanceDisposables);
});
this.onMouseDblClick(async e => {