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

Don't wait for 4s orphan check for just revived processes

Browse source 
Fixes #133964
This commit is contained in:
Daniel Imms 2021-11-15 00:43:22 -08:00
parent 4a7cd9416f
commit f76b133e69
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/platform/terminal/node/ptyService.ts
View file

@ -342,9 +342,10 @@ export class PtyService extends Disposable implements IPtyService {
private async _expandTerminalInstance(t: ITerminalInstanceLayoutInfoById): Promise<IRawTerminalInstanceLayoutInfo<IProcessDetails | null>> {
try {
const persistentProcessId = this._revivedPtyIdMap.get(t.terminal)?.newId ?? t.terminal;
const revivedPtyId = this._revivedPtyIdMap.get(t.terminal)?.newId;
const persistentProcessId = revivedPtyId ?? t.terminal;
const persistentProcess = this._throwIfNoPty(persistentProcessId);
const processDetails = persistentProcess && await this._buildProcessDetails(t.terminal, persistentProcess);
const processDetails = persistentProcess && await this._buildProcessDetails(t.terminal, persistentProcess, revivedPtyId !== undefined);
return {
terminal: { ...processDetails, id: persistentProcessId } ?? null,
relativeSize: t.relativeSize
@ -359,8 +360,10 @@ export class PtyService extends Disposable implements IPtyService {
}
}
private async _buildProcessDetails(id: number, persistentProcess: PersistentTerminalProcess): Promise<IProcessDetails> {
const [cwd, isOrphan] = await Promise.all([persistentProcess.getCwd(), persistentProcess.isOrphaned()]);
private async _buildProcessDetails(id: number, persistentProcess: PersistentTerminalProcess, wasRevived: boolean = false): Promise<IProcessDetails> {
// If the process was just revived, don't do the orphan check as it will
// take some time
const [cwd, isOrphan] = await Promise.all([persistentProcess.getCwd(), wasRevived ? true : persistentProcess.isOrphaned()]);
return {
id,
title: persistentProcess.title,