PowerShell is the default shell on Windows

Author: bobbrow

Extension/src/Debugger/runWithoutDebuggingAdapter.ts

@@ -9,6 +9,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { buildShellCommandLine, sessionIsWsl } from '../common';
+import { isWindows } from '../constants';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize = nls.loadMessageBundle();
@@ -116,15 +117,15 @@ export class RunWithoutDebuggingAdapter implements vscode.DebugAdapter {
                     ? this.terminal.creationOptions.shellPath?.toLowerCase()
                     : undefined;
                 const terminalShell: string | undefined = this.terminal.state.shell?.toLowerCase();
-                const defaultTerminalProfile: string | undefined = os.platform() === 'win32'
+                const defaultTerminalProfile: string | undefined = isWindows
                     ? vscode.workspace.getConfiguration('terminal.integrated').get<string>('defaultProfile.windows')?.toLowerCase()
                     : undefined;
                 const isPowerShell: boolean | undefined =
                     shellPath?.endsWith('pwsh.exe') || shellPath?.endsWith('powershell.exe') || shellPath?.endsWith('pwsh') ||
                     terminalShell?.includes('powershell') || terminalShell?.includes('pwsh') ||
                     defaultTerminalProfile?.includes('powershell') || defaultTerminalProfile?.includes('pwsh');
 
-                if (isPowerShell) {
+                if (isPowerShell || (isWindows && isPowerShell === undefined)) { // PowerShell is the default on Windows if we can't determine the shell.
                     executable = '&';
                     executableArgs = [program, ...args];
                 } else {

Extension/test/scenarios/RunWithoutDebugging/tests/runWithoutDebugging.terminals.test.ts

@@ -58,6 +58,10 @@ function disposeTerminals(programs: string[]): void {
     }
 }
 
+/**
+ * Sets or clears the setting for the default Windows terminal profile.
+ * @param profile The terminal profile to set as the default, or undefined to clear the setting.
+ */
 async function setWindowsDefaultTerminalProfile(profile?: WindowsTerminalProfile): Promise<void> {
     if (!isWindows) {
         return;
@@ -136,11 +140,11 @@ suite('Run Without Debugging Terminal and Arguments Test', function (this: Mocha
         }
     });
 
-    const consoleCases: { label: string; consoleMode: ConsoleMode; windowsProfiles?: WindowsTerminalProfile[] }[] = [
+    const consoleCases: { label: string; consoleMode: ConsoleMode; windowsProfiles?: (WindowsTerminalProfile | undefined)[] }[] = [
         {
             label: 'integrated terminal',
             consoleMode: 'integratedTerminal',
-            windowsProfiles: ['Command Prompt', 'PowerShell']
+            windowsProfiles: [undefined, 'Command Prompt', 'PowerShell']
         },
         {
             label: 'external terminal',
@@ -164,11 +168,9 @@ suite('Run Without Debugging Terminal and Arguments Test', function (this: Mocha
             const profiles: (WindowsTerminalProfile | undefined)[] = isWindows && consoleCase.consoleMode === 'integratedTerminal' ? consoleCase.windowsProfiles ?? [undefined] : [undefined];
 
             for (const profile of profiles) {
-                const profileSuffix = profile ? ` with ${profile} as the default terminal` : '';
+                const profileSuffix = profile ? ` with ${profile} as the default terminal` : consoleCase.consoleMode === 'integratedTerminal' ? ' with default terminal' : '';
                 test(`No-debug launch via ${consoleCase.label} handles ${programCase.label}${profileSuffix}`, async () => {
-                    if (profile) {
-                        await setWindowsDefaultTerminalProfile(profile);
-                    }
+                    await setWindowsDefaultTerminalProfile(profile);
 
                     disposeTerminals(executablePaths);
                     const sessionName = `Run Without Debugging Args (${consoleCase.consoleMode}, ${path.basename(programCase.programPath)}${profile ? `, ${profile}` : ''})`;