Merge branch 'master' into alexr00/terminalExitRace

This commit is contained in:
Alex Ross
2019-06-06 09:43:15 +02:00
committed by GitHub
560 changed files with 22209 additions and 7358 deletions

View File

@@ -176,7 +176,7 @@ export class ExtHostTerminal extends BaseExtHostTerminal implements vscode.Termi
this._pidPromiseComplete(processId);
this._pidPromiseComplete = null;
} else {
// Recreate the promise if this is the nth processId set (eg. reused task terminals)
// Recreate the promise if this is the nth processId set (e.g. reused task terminals)
this._pidPromise.then(pid => {
if (pid !== processId) {
this._pidPromise = Promise.resolve(processId);