fix: conda partial

Author: karthiknadig

src/features/terminal/shells/bash/bashStartup.ts

@@ -46,7 +46,9 @@ const regionEnd = '# <<< vscode python';
 
 function getActivationContent(key: string): string {
     const lineSep = '\n';
-    return [`if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`, `    . "$${key}"`, 'fi'].join(lineSep);
+    return [`if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`, `    eval "$${key}" || true`, 'fi'].join(
+        lineSep,
+    );
 }
 
 async function isStartupSetup(profile: string, key: string): Promise<ShellSetupState> {

src/features/terminal/shells/common/shellUtils.ts

@@ -9,19 +9,24 @@ function getCommandAsString(command: PythonCommandRunConfiguration[], shell: str
         const args = cmd.args ?? [];
         parts.push(quoteArgs([normalizeShellPath(cmd.executable, shell), ...args]).join(' '));
     }
+    if (shell === ShellConstants.PWSH) {
+        return parts.map((p) => `(${p})`).join(` ${delimiter} `);
+    }
     return parts.join(` ${delimiter} `);
 }
 
 export function getShellCommandAsString(shell: string, command: PythonCommandRunConfiguration[]): string {
     switch (shell) {
+        case ShellConstants.PWSH:
+            return getCommandAsString(command, shell, ';');
         case ShellConstants.NU:
             return getCommandAsString(command, shell, ';');
         case ShellConstants.FISH:
             return getCommandAsString(command, shell, '; and');
         case ShellConstants.BASH:
         case ShellConstants.SH:
         case ShellConstants.ZSH:
-        case ShellConstants.PWSH:
+
         case ShellConstants.CMD:
         case ShellConstants.GITBASH:
         default:

src/features/terminal/shells/pwsh/pwshStartup.ts

@@ -70,7 +70,11 @@ function getActivationContent(): string {
     const lineSep = isWindows() ? '\r\n' : '\n';
     const activationContent = [
         `if (($env:TERM_PROGRAM -eq 'vscode') -and ($null -ne $env:${POWERSHELL_ENV_KEY})) {`,
-        `    Invoke-Expression $env:${POWERSHELL_ENV_KEY}`,
+        '    try {',
+        `        Invoke-Expression $env:${POWERSHELL_ENV_KEY}`,
+        '    } catch {',
+        `        Write-Error "Failed to activate Python environment: $_" -ErrorAction Continue`,
+        '    }',
         '}',
     ].join(lineSep);
     return activationContent;