Fix strict function types in ext term

Tyriar · Tyriar · commit 997e4eaf740b · 2020-02-11T05:03:53.000-08:00
Part of microsoft#81574
diff --git a/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts b/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;
