Terminal and part of the debug changes needed to respond to cancelling a prelaunch task (microsoft#82255)

alexr00 · web-flow · commit 7e57821af24d · 2019-10-10T17:30:48.000+02:00
Part of microsoft#81768
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -780,9 +780,17 @@ export class DebugService implements IDebugService {
 			});
 			const taskPromise = this.taskService.run(task);
 			if (task.configurationProperties.isBackground) {
-				return new Promise((c, e) => once(e => e.kind === TaskEventKind.Inactive && e.taskId === task._id, this.taskService.onDidStateChange)(() => {
+				return new Promise((c, e) => once(e => {
+					// When a task isBackground it will go inactive when it is safe to launch.
+					// But when a background task is terminated by the user, it will also fire an inactive event.
+					// This means that we will not get to see the real exit code from running the task (undefined when terminated by the user).
+					// Catch the ProcessEnded event here, which occurs before inactive, and capture the exit code to prevent this.
+					return (e.kind === TaskEventKind.Inactive
+						|| (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
+						&& e.taskId === task._id;
+				}, this.taskService.onDidStateChange)(e => {
 					taskStarted = true;
-					c(null);
+					c(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
 				}));
 			}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -226,7 +226,7 @@ export interface ITerminalInstance {
 	 * is the processes' exit code, an exit code of null means the process was killed as a result of
 	 * the ITerminalInstance being disposed.
 	 */
-	onExit: Event<number>;
+	onExit: Event<number | undefined>;
 
 	processReady: Promise<void>;
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -232,8 +232,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	public get commandTracker(): CommandTrackerAddon | undefined { return this._commandTrackerAddon; }
 	public get navigationMode(): INavigationMode | undefined { return this._navigationModeAddon; }
 
-	private readonly _onExit = new Emitter<number>();
-	public get onExit(): Event<number> { return this._onExit.event; }
+	private readonly _onExit = new Emitter<number | undefined>();
+	public get onExit(): Event<number | undefined> { return this._onExit.event; }
 	private readonly _onDisposed = new Emitter<ITerminalInstance>();
 	public get onDisposed(): Event<ITerminalInstance> { return this._onDisposed.event; }
 	private readonly _onFocused = new Emitter<ITerminalInstance>();
@@ -1102,7 +1102,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			}
 		}
 
-		this._onExit.fire(exitCode || 0);
+		this._onExit.fire(exitCode);
 	}
 
 	private _attachPressAnyKeyToCloseListener(xterm: XTermTerminal) {

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {`
`232`	`232`	`public get commandTracker(): CommandTrackerAddon \| undefined { return this._commandTrackerAddon; }`
`233`	`233`	`public get navigationMode(): INavigationMode \| undefined { return this._navigationModeAddon; }`
`234`	`234`
`235`		`- private readonly _onExit = new Emitter<number>();`
`236`		`- public get onExit(): Event<number> { return this._onExit.event; }`
	`235`	`+ private readonly _onExit = new Emitter<number \| undefined>();`
	`236`	`+ public get onExit(): Event<number \| undefined> { return this._onExit.event; }`
`237`	`237`	`private readonly _onDisposed = new Emitter<ITerminalInstance>();`
`238`	`238`	`public get onDisposed(): Event<ITerminalInstance> { return this._onDisposed.event; }`
`239`	`239`	`private readonly _onFocused = new Emitter<ITerminalInstance>();`
`@@ -1102,7 +1102,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {`
`1102`	`1102`	`}`
`1103`	`1103`	`}`
`1104`	`1104`
`1105`		`- this._onExit.fire(exitCode \|\| 0);`
	`1105`	`+ this._onExit.fire(exitCode);`
`1106`	`1106`	`}`
`1107`	`1107`
`1108`	`1108`	`private _attachPressAnyKeyToCloseListener(xterm: XTermTerminal) {`