Merge branch 'main' into add-doc-strings

Author: eleanorjboyd

package-lock.json

@@ -36,6 +36,7 @@
         "url": "https://github.com/microsoft/vscode-python-environments/issues"
     },
     "main": "./dist/extension.js",
+    "l10n": "./l10n",
     "icon": "icon.png",
     "contributes": {
         "configuration": {

package.json

@@ -6,7 +6,7 @@
     "python-envs.pythonProjects.envManager.description": "The environment manager for creating and managing environments for this project.",
     "python-envs.pythonProjects.packageManager.description": "The package manager for managing packages in environments for this project.",
     "python-envs.terminal.showActivateButton.description": "Whether to show the 'Activate' button in the terminal menu",
-    "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.",
+    "python-envs.terminal.autoActivationType.description": "Specifies how the extension can activate an environment in a terminal.\n\nUtilizing Shell Startup requires changes to the shell script file and is only enabled for the following shells: zsh, fsh, pwsh, bash, cmd. When set to `command`, any shell can be activated.\n\nThis setting takes precedence over the legacy `python.terminal.activateEnvironment` setting. If this setting is not explicitly set and `python.terminal.activateEnvironment` is set to false, this setting will automatically be set to `off` to preserve your preference.\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\nTo revert changes made during shellStartup, run `Python Envs: Revert Shell Startup Script Changes`.",
     "python-envs.terminal.autoActivationType.command": "Activation by executing a command in the terminal.",
     "python-envs.terminal.autoActivationType.shellStartup": "Activation by modifying the terminal shell startup script. To use this feature we will need to modify your shell startup scripts.",
     "python-envs.terminal.autoActivationType.off": "No automatic activation of environments.",
@@ -36,5 +36,5 @@
     "python-envs.terminal.deactivate.title": "Deactivate Environment in Current Terminal",
     "python-envs.uninstallPackage.title": "Uninstall Package",
     "python-envs.revealProjectInExplorer.title": "Reveal Project in Explorer",
-    "python-envs.runPetInTerminal.title": "Run Python Environment Tool (PET) in Terminal"
+    "python-envs.runPetInTerminal.title": "Run Python Environment Tool (PET) in Terminal..."
 }

package.nls.json

@@ -1223,7 +1223,7 @@ export interface DidChangeEnvironmentVariablesEventArgs {
     /**
      * The type of change that occurred.
      */
-    changeTye: FileChangeType;
+    changeType: FileChangeType;
 }
 
 export interface PythonEnvironmentVariablesApi {

src/api.ts

@@ -9,6 +9,7 @@ import { EventNames } from './common/telemetry/constants';
 import { sendManagerSelectionTelemetry } from './common/telemetry/helpers';
 import { sendTelemetryEvent } from './common/telemetry/sender';
 import { createDeferred } from './common/utils/deferred';
+import { isWindows } from './common/utils/platformUtils';
 import {
     activeTerminal,
     createLogOutputChannel,
@@ -57,8 +58,9 @@ import {
 import { ShellStartupActivationVariablesManagerImpl } from './features/terminal/shellStartupActivationVariablesManager';
 import { cleanupStartupScripts } from './features/terminal/shellStartupSetupHandlers';
 import { TerminalActivationImpl } from './features/terminal/terminalActivationState';
+import { TerminalEnvVarInjector } from './features/terminal/terminalEnvVarInjector';
 import { TerminalManager, TerminalManagerImpl } from './features/terminal/terminalManager';
-import { getEnvironmentForTerminal } from './features/terminal/utils';
+import { getAutoActivationType, getEnvironmentForTerminal } from './features/terminal/utils';
 import { EnvManagerView } from './features/views/envManagersView';
 import { ProjectView } from './features/views/projectView';
 import { PythonStatusBarImpl } from './features/views/pythonStatusBar';
@@ -144,10 +146,15 @@ async function collectEnvironmentInfo(
 
         // Current settings (non-sensitive)
         const config = workspace.getConfiguration('python-envs');
+        const pyConfig = workspace.getConfiguration('python');
         info.push('\nExtension Settings:');
         info.push(`  Default Environment Manager: ${config.get('defaultEnvManager')}`);
         info.push(`  Default Package Manager: ${config.get('defaultPackageManager')}`);
-        info.push(`  Terminal Auto Activation: ${config.get('terminal.autoActivationType')}`);
+        const pyenvAct = config.get('terminal.autoActivationType', undefined);
+        const pythonAct = pyConfig.get('terminal.activateEnvironment', undefined);
+        info.push(
+            `Auto-activation is "${getAutoActivationType()}". Activation based on first 'py-env.terminal.autoActivationType' setting which is '${pyenvAct}' and 'python.terminal.activateEnvironment' if the first is undefined which is '${pythonAct}'.\n`,
+        );
     } catch (err) {
         info.push(`\nError collecting environment information: ${err}`);
     }
@@ -234,6 +241,10 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
         api,
     );
 
+    // Initialize terminal environment variable injection
+    const terminalEnvVarInjector = new TerminalEnvVarInjector(context.environmentVariableCollection, envVarManager);
+    context.subscriptions.push(terminalEnvVarInjector);
+
     context.subscriptions.push(
         shellStartupVarsMgr,
         registerCompletionProvider(envManagers),
@@ -437,12 +448,63 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
         commands.registerCommand('python-envs.runPetInTerminal', async () => {
             try {
                 const petPath = await getNativePythonToolsPath();
+
+                // Show quick pick menu for PET operation selection
+                const selectedOption = await window.showQuickPick(
+                    [
+                        {
+                            label: 'Find All Environments',
+                            description: 'Finds all environments and reports them to the standard output',
+                            detail: 'Runs: pet find --verbose',
+                        },
+                        {
+                            label: 'Resolve Environment...',
+                            description: 'Resolves & reports the details of the environment to the standard output',
+                            detail: 'Runs: pet resolve <path>',
+                        },
+                    ],
+                    {
+                        placeHolder: 'Select a Python Environment Tool (PET) operation',
+                        ignoreFocusOut: true,
+                    },
+                );
+
+                if (!selectedOption) {
+                    return; // User cancelled
+                }
+
                 const terminal = createTerminal({
                     name: 'Python Environment Tool (PET)',
                 });
                 terminal.show();
-                terminal.sendText(`"${petPath}"`, true);
-                traceInfo(`Running PET in terminal: ${petPath}`);
+
+                if (selectedOption.label === 'Find All Environments') {
+                    // Run pet find --verbose
+                    terminal.sendText(`"${petPath}" find --verbose`, true);
+                    traceInfo(`Running PET find command: ${petPath} find --verbose`);
+                } else if (selectedOption.label === 'Resolve Environment...') {
+                    // Show input box for path
+                    const placeholder = isWindows() ? 'C:\\path\\to\\python\\executable' : '/path/to/python/executable';
+                    const inputPath = await window.showInputBox({
+                        prompt: 'Enter the path to the Python executable to resolve',
+                        placeHolder: placeholder,
+                        ignoreFocusOut: true,
+                        validateInput: (value) => {
+                            if (!value || value.trim().length === 0) {
+                                return 'Please enter a valid path';
+                            }
+                            return null;
+                        },
+                    });
+
+                    if (!inputPath) {
+                        return; // User cancelled
+                    }
+
+                    // Run pet resolve with the provided path
+                    terminal.sendText(`"${petPath}" resolve "${inputPath.trim()}"`, true);
+                    traceInfo(`Running PET resolve command: ${petPath} resolve "${inputPath.trim()}"`);
+                }
             } catch (error) {
                 traceError('Error running PET in terminal', error);
                 window.showErrorMessage(`Failed to run Python Environment Tool: ${error}`);

src/extension.ts

@@ -1,12 +1,12 @@
-import * as path from 'path';
 import * as fsapi from 'fs-extra';
-import { Uri, Event, EventEmitter, FileChangeType } from 'vscode';
-import { DidChangeEnvironmentVariablesEventArgs, PythonEnvironmentVariablesApi } from '../../api';
+import * as path from 'path';
+import { Event, EventEmitter, FileChangeType, Uri } from 'vscode';
 import { Disposable } from 'vscode-jsonrpc';
+import { DidChangeEnvironmentVariablesEventArgs, PythonEnvironmentVariablesApi } from '../../api';
+import { resolveVariables } from '../../common/utils/internalVariables';
 import { createFileSystemWatcher, getConfiguration } from '../../common/workspace.apis';
 import { PythonProjectManager } from '../../internal.api';
 import { mergeEnvVariables, parseEnvFile } from './envVarUtils';
-import { resolveVariables } from '../../common/utils/internalVariables';
 
 export interface EnvVarManager extends PythonEnvironmentVariablesApi, Disposable {}
 
@@ -25,13 +25,13 @@ export class PythonEnvVariableManager implements EnvVarManager {
             this._onDidChangeEnvironmentVariables,
             this.watcher,
             this.watcher.onDidCreate((e) =>
-                this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Created }),
+                this._onDidChangeEnvironmentVariables.fire({ uri: e, changeType: FileChangeType.Created }),
             ),
             this.watcher.onDidChange((e) =>
-                this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Changed }),
+                this._onDidChangeEnvironmentVariables.fire({ uri: e, changeType: FileChangeType.Changed }),
             ),
             this.watcher.onDidDelete((e) =>
-                this._onDidChangeEnvironmentVariables.fire({ uri: e, changeTye: FileChangeType.Deleted }),
+                this._onDidChangeEnvironmentVariables.fire({ uri: e, changeType: FileChangeType.Deleted }),
             ),
         );
     }
@@ -48,7 +48,7 @@ export class PythonEnvVariableManager implements EnvVarManager {
 
         const config = getConfiguration('python', project?.uri ?? uri);
         let envFilePath = config.get<string>('envFile');
-        envFilePath = envFilePath ? path.normalize(resolveVariables(envFilePath)) : undefined;
+        envFilePath = envFilePath ? path.normalize(resolveVariables(envFilePath, uri)) : undefined;
 
         if (envFilePath && (await fsapi.pathExists(envFilePath))) {
             const other = await parseEnvFile(Uri.file(envFilePath));