Fix terminal not restoring after replay

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -296,10 +296,7 @@ export class TerminalService implements ITerminalService {
 			mark('code/terminal/didReconnect');
 			mark('code/terminal/willReplay');
 			const instances = await this._reconnectedTerminalGroups?.then(groups => groups.map(e => e.terminalInstances).flat()) ?? [];
-			await Promise.all(instances.map(e => new Promise<void>(r => Event.once(e.onProcessReplayComplete)(() => {
-				mark(`code/terminal/replay/${e.shellLaunchConfig.attachPersistentProcess?.id}`);
-				r();
-			}))));
+			await Promise.all(instances.map(e => new Promise<void>(r => Event.once(e.onProcessReplayComplete)(r))));
 			mark('code/terminal/didReplay');
 			for (const backend of this._terminalInstanceService.getRegisteredBackends()) {
 				mark('code/terminal/willGetPerformanceMarks');
@@ -469,13 +466,12 @@ export class TerminalService implements ITerminalService {
 
 	private _recreateTerminalGroups(layoutInfo?: ITerminalsLayoutInfo): Promise<ITerminalGroup[]> {
 		const groupPromises: Promise<ITerminalGroup | undefined>[] = [];
-		let reconnectCounter = 0;
 		let activeGroup: Promise<ITerminalGroup | undefined> | undefined;
 		if (layoutInfo) {
 			for (const tabLayout of layoutInfo.tabs) {
 				const terminalLayouts = tabLayout.terminals.filter(t => t.terminal && t.terminal.isOrphan);
 				if (terminalLayouts.length) {
-					reconnectCounter += terminalLayouts.length;
+					this._restoredGroupCount += terminalLayouts.length;
 					const promise = this._recreateTerminalGroup(tabLayout, terminalLayouts);
 					groupPromises.push(promise);
 					if (tabLayout.isActive) {

src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts

@@ -8,6 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { IProcessDataEvent, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap, ProcessPropertyType, IProcessReadyEvent, ILocalPtyService } from 'vs/platform/terminal/common/terminal';
 import { URI } from 'vs/base/common/uri';
 import { IPtyHostProcessReplayEvent, ISerializedCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { mark } from 'vs/base/common/performance';
 
 /**
  * Responsible for establishing and maintaining a connection with an existing terminal process
@@ -141,6 +142,7 @@ export class LocalPty extends Disposable implements ITerminalChildProcess {
 	}
 
 	async handleReplay(e: IPtyHostProcessReplayEvent) {
+		mark(`code/terminal/willHandleReplay/${this.id}`);
 		try {
 			this._inReplay = true;
 			for (const innerEvent of e.events) {
@@ -163,6 +165,7 @@ export class LocalPty extends Disposable implements ITerminalChildProcess {
 		// remove size override
 		this._onDidChangeProperty.fire({ type: ProcessPropertyType.OverrideDimensions, value: undefined });
 
+		mark(`code/terminal/didHandleReplay/${this.id}`);
 		this._onProcessReplayComplete.fire();
 	}