Merge pull request microsoft#210799 from microsoft/tyriar/207372_3

Allow embedder terminals to skip contributed profile check

Author: Tyriar

src/vs/workbench/contrib/terminal/browser/terminal.ts

@@ -438,6 +438,12 @@ export interface ICreateTerminalOptions {
 	 * The terminal's location (editor or panel), it's terminal parent (split to the right), or editor group
 	 */
 	location?: ITerminalLocationOptions;
+
+	/**
+	 * This terminal will not wait for contributed profiles to resolve which means it will proceed
+	 * when the workbench is not yet loaded.
+	 */
+	skipContributedProfileCheck?: boolean;
 }
 
 export interface TerminalEditorLocation {

src/vs/workbench/contrib/terminal/browser/terminalMainContribution.ts

@@ -66,7 +66,8 @@ export class TerminalMainContribution extends Disposable implements IWorkbenchCo
 		this._register(embedderTerminalService.onDidCreateTerminal(async embedderTerminal => {
 			const terminal = await terminalService.createTerminal({
 				config: embedderTerminal,
-				location: TerminalLocation.Panel
+				location: TerminalLocation.Panel,
+				skipContributedProfileCheck: true,
 			});
 			terminalService.setActiveInstance(terminal);
 			await terminalService.revealActiveTerminal();

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -952,7 +952,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 		const shellLaunchConfig = config && 'extensionIdentifier' in config ? {} : this._terminalInstanceService.convertProfileToShellLaunchConfig(config || {});
 
 		// Get the contributed profile if it was provided
-		const contributedProfile = await this._getContributedProfile(shellLaunchConfig, options);
+		const contributedProfile = options?.skipContributedProfileCheck ? undefined : await this._getContributedProfile(shellLaunchConfig, options);
 
 		const splitActiveTerminal = typeof options?.location === 'object' && 'splitActiveTerminal' in options.location ? options.location.splitActiveTerminal : typeof options?.location === 'object' ? 'parentTerminal' in options.location : false;