development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-25 03:56:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix terminal group restoration

Browse source 
Fixes #129245
This commit is contained in:
Daniel Imms 2021-07-23 07:04:44 -07:00
parent b1b4c5a351
commit 8de2b6abb8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -381,17 +381,17 @@ export class TerminalService implements ITerminalService {
this._attachProcessLayoutListeners();
}
private _recreateTerminalGroups(layoutInfo?: ITerminalsLayoutInfo): number {
private async _recreateTerminalGroups(layoutInfo?: ITerminalsLayoutInfo): Promise<number> {
let reconnectCounter = 0;
let activeGroup: ITerminalGroup | undefined;
if (layoutInfo) {
layoutInfo.tabs.forEach(groupLayout => {
for (const groupLayout of layoutInfo.tabs) {
const terminalLayouts = groupLayout.terminals.filter(t => t.terminal && t.terminal.isOrphan);
if (terminalLayouts.length) {
reconnectCounter += terminalLayouts.length;
let terminalInstance: ITerminalInstance | undefined;
let group: ITerminalGroup | undefined;
terminalLayouts.forEach(async (terminalLayout) => {
for (const terminalLayout of terminalLayouts) {
if (!terminalInstance) {
// create group and terminal
terminalInstance = await this.createTerminal({
@ -404,9 +404,9 @@ export class TerminalService implements ITerminalService {
}
} else {
// add split terminals to this group
this.splitInstance(terminalInstance, { attachPersistentProcess: terminalLayout.terminal! });
await this.splitInstance(terminalInstance, { attachPersistentProcess: terminalLayout.terminal! });
}
});
}
const activeInstance = this.instances.find(t => {
return t.shellLaunchConfig.attachPersistentProcess?.id === groupLayout.activePersistentProcessId;
});
@ -415,7 +415,7 @@ export class TerminalService implements ITerminalService {
}
group?.resizePanes(groupLayout.terminals.map(terminal => terminal.relativeSize));
}
});
}
if (layoutInfo.tabs.length) {
this._terminalGroupService.activeGroup = activeGroup;
}