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

Merge pull request #209044 from microsoft/tyriar/208650

Browse source 
Fire onDidStartTerminalShellExecution from executeCommand in microtask
This commit is contained in:
Daniel Imms 2024-03-28 10:51:34 -07:00 committed by GitHub
parent 7b2cc73cf2 45e81d4179
commit 82f8d08792
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
View file

@ -74,7 +74,9 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
// console.log('*** onDidEndTerminalShellExecution', e); // console.log('*** onDidEndTerminalShellExecution', e);
// }); // });
// setTimeout(() => { // setTimeout(() => {
// console.log('before executeCommand(\"echo hello\")');
// Array.from(this._activeShellIntegrations.values())[0].value.executeCommand('echo hello'); // Array.from(this._activeShellIntegrations.values())[0].value.executeCommand('echo hello');
// console.log('after executeCommand(\"echo hello\")');
// }, 4000); // }, 4000);
} }
@ -160,14 +162,16 @@ class InternalTerminalShellIntegration extends Disposable {
}, },
executeCommand(commandLine): vscode.TerminalShellExecution { executeCommand(commandLine): vscode.TerminalShellExecution {
that._onDidRequestShellExecution.fire(commandLine); that._onDidRequestShellExecution.fire(commandLine);
const execution = that.startShellExecution(commandLine, that._cwd).value; // Fire the event in a microtask to allow the extension to use the execution before
// the start event fires
const execution = that.startShellExecution(commandLine, that._cwd, true).value;
that._ignoreNextExecution = true; that._ignoreNextExecution = true;
return execution; return execution;
} }
}; };
} }
startShellExecution(commandLine: string, cwd: URI | string | undefined): InternalTerminalShellExecution { startShellExecution(commandLine: string, cwd: URI | string | undefined, fireEventInMicrotask?: boolean): InternalTerminalShellExecution {
if (this._ignoreNextExecution && this._currentExecution) { if (this._ignoreNextExecution && this._currentExecution) {
this._ignoreNextExecution = false; this._ignoreNextExecution = false;
} else { } else {
@ -175,8 +179,12 @@ class InternalTerminalShellIntegration extends Disposable {
this._currentExecution.endExecution(undefined, undefined); this._currentExecution.endExecution(undefined, undefined);
this._onDidRequestEndExecution.fire({ execution: this._currentExecution.value, exitCode: undefined }); this._onDidRequestEndExecution.fire({ execution: this._currentExecution.value, exitCode: undefined });
} }
this._currentExecution = new InternalTerminalShellExecution(this._terminal, commandLine, cwd); const currentExecution = this._currentExecution = new InternalTerminalShellExecution(this._terminal, commandLine, cwd);
this._onDidStartTerminalShellExecution.fire(this._currentExecution.value); if (fireEventInMicrotask) {
queueMicrotask(() => this._onDidStartTerminalShellExecution.fire(currentExecution.value));
} else {
this._onDidStartTerminalShellExecution.fire(this._currentExecution.value);
}
} }
return this._currentExecution; return this._currentExecution;
} }