Merge branch 'main' into quote-executable-task

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.1.0",
+    "version": "1.3.0",
     "publisher": "ms-python",
     "preview": true,
     "engines": {

package.json

@@ -1,10 +1,10 @@
 import { Terminal, TerminalShellExecution } from 'vscode';
 import { PythonEnvironment, PythonTerminalExecutionOptions } from '../../api';
-import { onDidEndTerminalShellExecution } from '../../common/window.apis';
 import { createDeferred } from '../../common/utils/deferred';
-import { quoteArgs } from '../execution/execUtils';
-import { identifyTerminalShell } from '../common/shellDetector';
+import { onDidEndTerminalShellExecution } from '../../common/window.apis';
 import { ShellConstants } from '../common/shellConstants';
+import { identifyTerminalShell } from '../common/shellDetector';
+import { quoteArgs } from '../execution/execUtils';
 
 export async function runInTerminal(
     environment: PythonEnvironment,
@@ -15,11 +15,10 @@ export async function runInTerminal(
         terminal.show();
     }
 
-    const executable =
-        environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python';
+    let executable = environment.execInfo?.activatedRun?.executable ?? environment.execInfo?.run.executable ?? 'python';
     const args = environment.execInfo?.activatedRun?.args ?? environment.execInfo?.run.args ?? [];
     const allArgs = [...args, ...(options.args ?? [])];
-
+    const shellType = identifyTerminalShell(terminal);
     if (terminal.shellIntegration) {
         let execution: TerminalShellExecution | undefined;
         const deferred = createDeferred<void>();
@@ -29,10 +28,21 @@ export async function runInTerminal(
                 deferred.resolve();
             }
         });
+
+        const shouldSurroundWithQuotes =
+            executable.includes(' ') && !executable.startsWith('"') && !executable.endsWith('"');
+        // Handle case where executable contains white-spaces.
+        if (shouldSurroundWithQuotes) {
+            executable = `"${executable}"`;
+        }
+
+        if (shellType === ShellConstants.PWSH && !executable.startsWith('&')) {
+            // PowerShell requires commands to be prefixed with '&' to run them.
+            executable = `& ${executable}`;
+        }
         execution = terminal.shellIntegration.executeCommand(executable, allArgs);
         await deferred.promise;
     } else {
-        const shellType = identifyTerminalShell(terminal);
         let text = quoteArgs([executable, ...allArgs]).join(' ');
         if (shellType === ShellConstants.PWSH && !text.startsWith('&')) {
             // PowerShell requires commands to be prefixed with '&' to run them.

src/features/terminal/runInTerminal.ts

@@ -30,7 +30,7 @@ import {
 } from '../../api';
 import { PYTHON_EXTENSION_ID } from '../../common/constants';
 import { VenvManagerStrings } from '../../common/localize';
-import { traceError } from '../../common/logging';
+import { traceError, traceWarn } from '../../common/logging';
 import { createDeferred, Deferred } from '../../common/utils/deferred';
 import { showErrorMessage, withProgress } from '../../common/window.apis';
 import { findParentIfFile } from '../../features/envCommands';
@@ -186,12 +186,30 @@ export class VenvManager implements EnvironmentManager {
 
                 // Add .gitignore to the .venv folder
                 try {
-                    const venvDir = environment.environmentPath.fsPath;
-                    const gitignorePath = path.join(venvDir, '.gitignore');
+                    // determine if env path is python binary or environment folder
+                    let envPath = environment.environmentPath.fsPath;
+                    try {
+                        const stat = await fs.stat(envPath);
+                        if (!stat.isDirectory()) {
+                            // If the env path is a file (likely the python binary), use parent-parent as the env path
+                            // following format of .venv/bin/python or .venv\Scripts\python.exe
+                            envPath = Uri.file(path.dirname(path.dirname(envPath))).fsPath;
+                        }
+                    } catch (err) {
+                        // If stat fails, fallback to original envPath
+                        traceWarn(
+                            `Failed to stat environment path: ${envPath}. Error: ${
+                                err instanceof Error ? err.message : String(err)
+                            }, continuing to attempt to create .gitignore.`,
+                        );
+                    }
+                    const gitignorePath = path.join(envPath, '.gitignore');
                     await fs.writeFile(gitignorePath, '*\n', { flag: 'w' });
                 } catch (err) {
                     traceError(
-                        `Failed to create .gitignore in venv: ${err instanceof Error ? err.message : String(err)}`,
+                        `Failed to create .gitignore in venv: ${
+                            err instanceof Error ? err.message : String(err)
+                        }, continuing.`,
                     );
                 }