Merge pull request microsoft#186033 from microsoft/tyriar/185393_3

Resolve profiles on main in parallel

Author: Tyriar

src/vs/platform/terminal/node/terminalProfiles.ts

@@ -167,84 +167,99 @@ async function transformToTerminalProfiles(
 	logService?: ILogService,
 	variableResolver?: (text: string[]) => Promise<string[]>,
 ): Promise<ITerminalProfile[]> {
-	const resultProfiles: ITerminalProfile[] = [];
+	const promises: Promise<ITerminalProfile | undefined>[] = [];
 	for (const [profileName, profile] of entries) {
-		if (profile === null) { continue; }
-		let originalPaths: (string | ITerminalUnsafePath)[];
-		let args: string[] | string | undefined;
-		let icon: ThemeIcon | URI | { light: URI; dark: URI } | undefined = undefined;
-		// use calculated values if path is not specified
-		if ('source' in profile && !('path' in profile)) {
-			const source = profileSources?.get(profile.source);
-			if (!source) {
-				continue;
-			}
-			originalPaths = source.paths;
-
-			// if there are configured args, override the default ones
-			args = profile.args || source.args;
-			if (profile.icon) {
-				icon = validateIcon(profile.icon);
-			} else if (source.icon) {
-				icon = source.icon;
-			}
-		} else {
-			originalPaths = Array.isArray(profile.path) ? profile.path : [profile.path];
-			args = isWindows ? profile.args : Array.isArray(profile.args) ? profile.args : undefined;
-			icon = validateIcon(profile.icon);
+		promises.push(getValidatedProfile(profileName, profile, defaultProfileName, fsProvider, shellEnv, logService, variableResolver));
+	}
+	return (await Promise.all(promises)).filter(e => !!e) as ITerminalProfile[];
+}
+
+async function getValidatedProfile(
+	profileName: string,
+	profile: IUnresolvedTerminalProfile,
+	defaultProfileName: string | undefined,
+	fsProvider: IFsProvider,
+	shellEnv: typeof process.env = process.env,
+	logService?: ILogService,
+	variableResolver?: (text: string[]) => Promise<string[]>
+): Promise<ITerminalProfile | undefined> {
+	if (profile === null) {
+		return undefined;
+	}
+	let originalPaths: (string | ITerminalUnsafePath)[];
+	let args: string[] | string | undefined;
+	let icon: ThemeIcon | URI | { light: URI; dark: URI } | undefined = undefined;
+	// use calculated values if path is not specified
+	if ('source' in profile && !('path' in profile)) {
+		const source = profileSources?.get(profile.source);
+		if (!source) {
+			return undefined;
 		}
+		originalPaths = source.paths;
 
-		let paths: (string | ITerminalUnsafePath)[];
-		if (variableResolver) {
-			// Convert to string[] for resolve
-			const mapped = originalPaths.map(e => typeof e === 'string' ? e : e.path);
-			const resolved = await variableResolver(mapped);
-			// Convert resolved back to (T | string)[]
-			paths = new Array(originalPaths.length);
-			for (let i = 0; i < originalPaths.length; i++) {
-				if (typeof originalPaths[i] === 'string') {
-					paths[i] = resolved[i];
-				} else {
-					paths[i] = {
-						path: resolved[i],
-						isUnsafe: true
-					};
-				}
-			}
-		} else {
-			paths = originalPaths.slice();
+		// if there are configured args, override the default ones
+		args = profile.args || source.args;
+		if (profile.icon) {
+			icon = validateIcon(profile.icon);
+		} else if (source.icon) {
+			icon = source.icon;
 		}
+	} else {
+		originalPaths = Array.isArray(profile.path) ? profile.path : [profile.path];
+		args = isWindows ? profile.args : Array.isArray(profile.args) ? profile.args : undefined;
+		icon = validateIcon(profile.icon);
+	}
 
-		let requiresUnsafePath: string | undefined;
-		if (profile.requiresPath) {
-			// Validate requiresPath exists
-			let actualRequiredPath: string;
-			if (isString(profile.requiresPath)) {
-				actualRequiredPath = profile.requiresPath;
+	let paths: (string | ITerminalUnsafePath)[];
+	if (variableResolver) {
+		// Convert to string[] for resolve
+		const mapped = originalPaths.map(e => typeof e === 'string' ? e : e.path);
+
+		const resolved = await variableResolver(mapped);
+		// Convert resolved back to (T | string)[]
+		paths = new Array(originalPaths.length);
+		for (let i = 0; i < originalPaths.length; i++) {
+			if (typeof originalPaths[i] === 'string') {
+				paths[i] = resolved[i];
 			} else {
-				actualRequiredPath = profile.requiresPath.path;
-				if (profile.requiresPath.isUnsafe) {
-					requiresUnsafePath = actualRequiredPath;
-				}
-			}
-			const result = await fsProvider.existsFile(actualRequiredPath);
-			if (!result) {
-				continue;
+				paths[i] = {
+					path: resolved[i],
+					isUnsafe: true
+				};
 			}
 		}
+	} else {
+		paths = originalPaths.slice();
+	}
 
-		const validatedProfile = await validateProfilePaths(profileName, defaultProfileName, paths, fsProvider, shellEnv, args, profile.env, profile.overrideName, profile.isAutoDetected, requiresUnsafePath);
-		if (validatedProfile) {
-			validatedProfile.isAutoDetected = profile.isAutoDetected;
-			validatedProfile.icon = icon;
-			validatedProfile.color = profile.color;
-			resultProfiles.push(validatedProfile);
+	let requiresUnsafePath: string | undefined;
+	if (profile.requiresPath) {
+		// Validate requiresPath exists
+		let actualRequiredPath: string;
+		if (isString(profile.requiresPath)) {
+			actualRequiredPath = profile.requiresPath;
 		} else {
-			logService?.debug('Terminal profile not validated', profileName, originalPaths);
+			actualRequiredPath = profile.requiresPath.path;
+			if (profile.requiresPath.isUnsafe) {
+				requiresUnsafePath = actualRequiredPath;
+			}
+		}
+		const result = await fsProvider.existsFile(actualRequiredPath);
+		if (!result) {
+			return;
 		}
 	}
-	logService?.debug('Validated terminal profiles', resultProfiles);
-	return resultProfiles;
+
+	const validatedProfile = await validateProfilePaths(profileName, defaultProfileName, paths, fsProvider, shellEnv, args, profile.env, profile.overrideName, profile.isAutoDetected, requiresUnsafePath);
+	if (!validatedProfile) {
+		logService?.debug('Terminal profile not validated', profileName, originalPaths);
+		return undefined;
+	}
+
+	validatedProfile.isAutoDetected = profile.isAutoDetected;
+	validatedProfile.icon = icon;
+	validatedProfile.color = profile.color;
+	return validatedProfile;
 }
 
 function validateIcon(icon: string | TerminalIcon | undefined): TerminalIcon | undefined {