Use void | number for onDidClose

Tyriar · Tyriar · commit 6f998109d8ff · 2019-08-22T07:06:13.000-07:00
Fixes microsoft#79643
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -881,6 +881,11 @@ declare module 'vscode' {
 		/**
 		 * An event that when fired will signal that the pty is closed and dispose of the terminal.
 		 *
+		 * A number can be used to provide an exit code for the terminal. Exit codes must be
+		 * positive and a non-zero exit codes signals failure which shows a notification for a
+		 * regular terminal and allows dependent tasks to proceed when used with the
+		 * `CustomExecution2` API.
+		 *
 		 * **Example:** Exit the terminal when "y" is pressed, otherwise show a notification.
 		 * ```typescript
 		 * const writeEmitter = new vscode.EventEmitter<string>();
@@ -899,7 +904,7 @@ declare module 'vscode' {
 		 * };
 		 * vscode.window.createTerminal({ name: 'Exit example', pty });
 		 */
-		onDidClose?: Event<void>;
+		onDidClose?: Event<void | number>;
 
 		/**
 		 * Implement to handle when the pty is open and ready to start firing events.
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -738,7 +738,7 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {
 		// Attach the listeners
 		this._pty.onDidWrite(e => this._onProcessData.fire(e));
 		if (this._pty.onDidClose) {
-			this._pty.onDidClose(e => this._onProcessExit.fire(0));
+			this._pty.onDidClose(e => this._onProcessExit.fire(e || 0));
 		}
 		if (this._pty.onDidOverrideDimensions) {
 			this._pty.onDidOverrideDimensions(e => this._onProcessOverrideDimensions.fire(e ? { cols: e.columns, rows: e.rows } : e));

Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,7 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {`
`738`	`738`	`// Attach the listeners`
`739`	`739`	`this._pty.onDidWrite(e => this._onProcessData.fire(e));`
`740`	`740`	`if (this._pty.onDidClose) {`
`741`		`- this._pty.onDidClose(e => this._onProcessExit.fire(0));`
	`741`	`+ this._pty.onDidClose(e => this._onProcessExit.fire(e \|\| 0));`
`742`	`742`	`}`
`743`	`743`	`if (this._pty.onDidOverrideDimensions) {`
`744`	`744`	`this._pty.onDidOverrideDimensions(e => this._onProcessOverrideDimensions.fire(e ? { cols: e.columns, rows: e.rows } : e));`