Merge branch 'main' into bubbly-bats

Author: eleanorjboyd

package-lock.json

@@ -2,7 +2,7 @@
     "name": "vscode-python-envs",
     "displayName": "Python Environments",
     "description": "Provides a unified python environment experience",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "publisher": "ms-python",
     "preview": true,
     "engines": {

package.json

@@ -1,4 +1,4 @@
-function quoteArg(arg: string): string {
+export function quoteArg(arg: string): string {
     if (arg.indexOf(' ') >= 0 && !(arg.startsWith('"') && arg.endsWith('"'))) {
         return `"${arg}"`;
     }

src/features/execution/execUtils.ts

@@ -8,10 +8,10 @@ import {
     Uri,
     WorkspaceFolder,
 } from 'vscode';
-import { PythonTaskExecutionOptions } from '../../api';
-import { getWorkspaceFolder } from '../../common/workspace.apis';
-import { PythonEnvironment } from '../../api';
+import { PythonEnvironment, PythonTaskExecutionOptions } from '../../api';
 import { executeTask } from '../../common/tasks.apis';
+import { getWorkspaceFolder } from '../../common/workspace.apis';
+import { quoteArg } from './execUtils';
 
 function getWorkspaceFolderOrDefault(uri?: Uri): WorkspaceFolder | TaskScope {
     const workspace = uri ? getWorkspaceFolder(uri) : undefined;
@@ -25,8 +25,8 @@ export async function runAsTask(
 ): Promise<TaskExecution> {
     const workspace: WorkspaceFolder | TaskScope = getWorkspaceFolderOrDefault(options.project?.uri);
 
-    const executable =
-        environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python';
+    let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python';
+    executable = quoteArg(executable);
     const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? [];
     const allArgs = [...args, ...options.args];
 

src/features/execution/runAsTask.ts

@@ -1,3 +1,3 @@
 export const BASH_ENV_KEY = 'VSCODE_BASH_ACTIVATE';
 export const ZSH_ENV_KEY = 'VSCODE_ZSH_ACTIVATE';
-export const BASH_SCRIPT_VERSION = '0.1.0';
+export const BASH_SCRIPT_VERSION = '0.1.1';

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

@@ -48,9 +48,12 @@ function getActivationContent(key: string): string {
     const lineSep = '\n';
     return [
         `# version: ${BASH_SCRIPT_VERSION}`,
-        `if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`,
-        `    eval "$${key}" || true`,
-        'fi',
+        `if [ -z "$VSCODE_PYTHON_AUTOACTIVATE_GUARD" ]; then`,
+        `    export VSCODE_PYTHON_AUTOACTIVATE_GUARD=1`,
+        `    if [ -n "$${key}" ] && [ "$TERM_PROGRAM" = "vscode" ]; then`,
+        `        eval "$${key}" || true`,
+        `    fi`,
+        `fi`,
     ].join(lineSep);
 }
 

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

@@ -1,2 +1,2 @@
 export const FISH_ENV_KEY = 'VSCODE_FISH_ACTIVATE';
-export const FISH_SCRIPT_VERSION = '0.1.0';
+export const FISH_SCRIPT_VERSION = '0.1.1';

src/features/terminal/shells/fish/fishConstants.ts

@@ -34,9 +34,12 @@ function getActivationContent(key: string): string {
     const lineSep = '\n';
     return [
         `# version: ${FISH_SCRIPT_VERSION}`,
-        `if test "$TERM_PROGRAM" = "vscode"; and set -q ${key}`,
-        `    eval $${key}`,
-        'end',
+        `if not set -q VSCODE_PYTHON_AUTOACTIVATE_GUARD`,
+        `    set -gx VSCODE_PYTHON_AUTOACTIVATE_GUARD 1`,
+        `    if test "$TERM_PROGRAM" = "vscode"; and set -q ${key}`,
+        `        eval $${key}`,
+        `    end`,
+        `end`,
     ].join(lineSep);
 }
 

src/features/terminal/shells/fish/fishStartup.ts

@@ -1,2 +1,2 @@
 export const POWERSHELL_ENV_KEY = 'VSCODE_PWSH_ACTIVATE';
-export const PWSH_SCRIPT_VERSION = '0.1.0';
+export const PWSH_SCRIPT_VERSION = '0.1.1';

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

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