Merge branch 'master' into tyriar/75793

src/vs/vscode.d.ts

@@ -4930,6 +4930,21 @@ declare module 'vscode' {
 		 */
 		readonly creationOptions: Readonly<TerminalOptions | ExtensionTerminalOptions>;
 
+		/**
+		 * The exit status of the terminal, this will be undefined while the terminal is active.
+		 *
+		 * **Example:** Show a notification with the exit code when the terminal exits with a
+		 * non-zero exit code.
+		 * ```typescript
+		 * window.onDidCloseTerminal(t => {
+		 *   if (t.exitStatus && t.exitStatus.code) {
+		 *   	vscode.window.showInformationMessage(`Exit code: ${t.exitStatus.code}`);
+		 *   }
+		 * });
+		 * ```
+		 */
+		readonly exitStatus: TerminalExitStatus | undefined;
+
 		/**
 		 * Send text to the terminal. The text is written to the stdin of the underlying pty process
 		 * (shell) of the terminal.
@@ -7746,6 +7761,20 @@ declare module 'vscode' {
 		readonly rows: number;
 	}
 
+	/**
+	 * Represents how a terminal exited.
+	 */
+	export interface TerminalExitStatus {
+		/**
+		 * The exit code that a terminal exited with, it can have the following values:
+		 * - Zero: the terminal process or custom execution succeeded.
+		 * - Non-zero: the terminal process or custom execution failed.
+		 * - `undefined`: the user forcibly closed the terminal or a custom execution exited
+		 *   without providing an exit code.
+		 */
+		readonly code: number | undefined;
+	}
+
 	/**
 	 * A location in the editor at which progress information can be shown. It depends on the
 	 * location how progress is visually represented.

src/vs/vscode.proposed.d.ts

@@ -1025,38 +1025,6 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region Terminal exit status https://github.com/microsoft/vscode/issues/62103
-
-	export interface TerminalExitStatus {
-		/**
-		 * The exit code that a terminal exited with, it can have the following values:
-		 * - Zero: the terminal process or custom execution succeeded.
-		 * - Non-zero: the terminal process or custom execution failed.
-		 * - `undefined`: the user forcibly closed the terminal or a custom execution exited
-		 *   without providing an exit code.
-		 */
-		readonly code: number | undefined;
-	}
-
-	export interface Terminal {
-		/**
-		 * The exit status of the terminal, this will be undefined while the terminal is active.
-		 *
-		 * **Example:** Show a notification with the exit code when the terminal exits with a
-		 * non-zero exit code.
-		 * ```typescript
-		 * window.onDidCloseTerminal(t => {
-		 *   if (t.exitStatus && t.exitStatus.code) {
-		 *   	vscode.window.showInformationMessage(`Exit code: ${t.exitStatus.code}`);
-		 *   }
-		 * });
-		 * ```
-		 */
-		readonly exitStatus: TerminalExitStatus | undefined;
-	}
-
-	//#endregion
-
 	//#region Terminal dimensions property and change event https://github.com/microsoft/vscode/issues/55718
 
 	/**

src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts

@@ -301,29 +301,28 @@ export class LinuxExternalTerminalService implements IExternalTerminalService {
 
 	private static _DEFAULT_TERMINAL_LINUX_READY: Promise<string>;
 
-	public static getDefaultTerminalLinuxReady(): Promise<string> {
+	public static async getDefaultTerminalLinuxReady(): Promise<string> {
 		if (!LinuxExternalTerminalService._DEFAULT_TERMINAL_LINUX_READY) {
-			LinuxExternalTerminalService._DEFAULT_TERMINAL_LINUX_READY = new Promise<string>(c => {
+			LinuxExternalTerminalService._DEFAULT_TERMINAL_LINUX_READY = new Promise(async r => {
 				if (env.isLinux) {
-					Promise.all([pfs.exists('/etc/debian_version'), Promise.resolve(process.lazyEnv) || Promise.resolve(undefined)]).then(([isDebian]) => {
-						if (isDebian) {
-							c('x-terminal-emulator');
-						} else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
-							c('gnome-terminal');
-						} else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
-							c('konsole');
-						} else if (process.env.COLORTERM) {
-							c(process.env.COLORTERM);
-						} else if (process.env.TERM) {
-							c(process.env.TERM);
-						} else {
-							c('xterm');
-						}
-					});
-					return;
+					const isDebian = await pfs.exists('/etc/debian_version');
+					await process.lazyEnv;
+					if (isDebian) {
+						r('x-terminal-emulator');
+					} else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
+						r('gnome-terminal');
+					} else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
+						r('konsole');
+					} else if (process.env.COLORTERM) {
+						r(process.env.COLORTERM);
+					} else if (process.env.TERM) {
+						r(process.env.TERM);
+					} else {
+						r('xterm');
+					}
+				} else {
+					r('xterm');
 				}
-
-				c('xterm');
 			});
 		}
 		return LinuxExternalTerminalService._DEFAULT_TERMINAL_LINUX_READY;