Merge branch 'main' into copilot/fix-330

Author: eleanorjboyd

package.json

@@ -457,12 +457,12 @@
                 {
                     "command": "python-envs.addPythonProject",
                     "group": "inline",
-                    "when": "explorerViewletVisible && explorerResourceIsFolder"
+                    "when": "explorerViewletVisible && explorerResourceIsFolder && !python-envs:isExistingProject"
                 },
                 {
                     "command": "python-envs.addPythonProject",
                     "group": "inline",
-                    "when": "explorerViewletVisible && resourceExtname == .py"
+                    "when": "explorerViewletVisible && resourceExtname == .py && !python-envs:isExistingProject"
                 }
             ],
             "editor/title/run": [

package.nls.json

@@ -13,7 +13,7 @@
     "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes",
     "python-envs.setEnvManager.title": "Set Environment Manager",
     "python-envs.setPkgManager.title": "Set Package Manager",
-    "python-envs.addPythonProject.title": "Add Python Project",
+    "python-envs.addPythonProject.title": "Add as Python Project",
     "python-envs.removePythonProject.title": "Remove Python Project",
     "python-envs.copyEnvPath.title": "Copy Environment Path",
     "python-envs.copyProjectPath.title": "Copy Project Path",
@@ -37,4 +37,4 @@
     "python-envs.uninstallPackage.title": "Uninstall Package",
     "python.languageModelTools.python_environment.userDescription": "Get Python environment info for a file or path, including version, packages, and the command to run it.",
     "python.languageModelTools.python_install_package.userDescription": "Installs Python packages in the given workspace."
-}
+}

src/extension.ts

@@ -1,4 +1,4 @@
-import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri } from 'vscode';
+import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode';
 import { PythonEnvironment, PythonEnvironmentApi } from './api';
 import { ensureCorrectVersion } from './common/extVersion';
 import { registerTools } from './common/lm.apis';
@@ -13,7 +13,6 @@ import {
     activeTerminal,
     createLogOutputChannel,
     onDidChangeActiveTerminal,
-    onDidChangeActiveTextEditor,
     onDidChangeTerminalShellIntegration,
 } from './common/window.apis';
 import { createManagerReady } from './features/common/managerReady';
@@ -88,6 +87,14 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
     const projectManager: PythonProjectManager = new PythonProjectManagerImpl();
     context.subscriptions.push(projectManager);
 
+    // Helper function to check if a resource is an existing Python project
+    const isExistingProject = (uri: Uri | undefined): boolean => {
+        if (!uri) {
+            return false;
+        }
+        return projectManager.get(uri) !== undefined;
+    };
+
     const envVarManager: EnvVarManager = new PythonEnvVariableManager(projectManager);
     context.subscriptions.push(envVarManager);
 
@@ -194,6 +201,10 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
             await setPackageManagerCommand(envManagers, projectManager);
         }),
         commands.registerCommand('python-envs.addPythonProject', async (resource) => {
+            // Set context to show/hide menu item depending on whether the resource is already a Python project
+            if (resource instanceof Uri) {
+                commands.executeCommand('setContext', 'python-envs:isExistingProject', isExistingProject(resource));
+            }
             await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators);
         }),
         commands.registerCommand('python-envs.removePythonProject', async (item) => {
@@ -254,7 +265,7 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
                 }
             }
         }),
-        onDidChangeActiveTextEditor(async () => {
+        window.onDidChangeActiveTextEditor(async () => {
             updateViewsAndStatus(statusBar, workspaceView, managerView, api);
         }),
         envManagers.onDidChangeEnvironment(async () => {

src/features/creators/existingProjects.ts

@@ -15,25 +15,35 @@ export class ExistingProjects implements PythonProjectCreator {
     async create(
         _options?: PythonProjectCreatorOptions,
     ): Promise<PythonProject | PythonProject[] | Uri | Uri[] | undefined> {
-        const results = await showOpenDialog({
-            canSelectFiles: true,
-            canSelectFolders: true,
-            canSelectMany: true,
-            filters: {
-                python: ['py'],
-            },
-            title: ProjectCreatorString.selectFilesOrFolders,
-        });
+        let existingAddUri: Uri[] | undefined;
+        if (_options?.rootUri) {
+            // If rootUri is provided, do not prompt
+            existingAddUri = [_options.rootUri];
+        } else if (_options?.quickCreate) {
+            // If quickCreate is true & no rootUri is provided, we should not prompt for any input
+            throw new Error('Root URI is required in quickCreate mode.');
+        } else {
+            // Prompt the user to select files or folders
+            existingAddUri = await showOpenDialog({
+                canSelectFiles: true,
+                canSelectFolders: true,
+                canSelectMany: true,
+                filters: {
+                    python: ['py'],
+                },
+                title: ProjectCreatorString.selectFilesOrFolders,
+            });
+        }
 
-        if (!results || results.length === 0) {
+        if (!existingAddUri || existingAddUri.length === 0) {
             // User cancelled the dialog & doesn't want to add any projects
             return;
         }
 
         // do we have any limitations that need to be applied here?
         // like selected folder not child of workspace folder?
 
-        const filtered = results.filter((uri) => {
+        const filtered = existingAddUri.filter((uri) => {
             const p = this.pm.get(uri);
             if (p) {
                 // Skip this project if there's already a project registered with exactly the same path

src/features/envCommands.ts

@@ -378,8 +378,29 @@ export async function addPythonProjectCommand(
             name: resource.fsPath,
             rootUri: resource,
         };
+
+        // When a URI is provided (right-click in explorer), directly use the existingProjects creator
+        const existingProjectsCreator = pc.getProjectCreators().find((c) => c.name === 'existingProjects');
+        if (existingProjectsCreator) {
+            try {
+                if (existingProjectsCreator.supportsQuickCreate) {
+                    options = {
+                        ...options,
+                        quickCreate: true,
+                    };
+                }
+                await existingProjectsCreator.create(options);
+                return;
+            } catch (ex) {
+                if (ex === QuickInputButtons.Back) {
+                    return addPythonProjectCommand(resource, wm, em, pc);
+                }
+                throw ex;
+            }
+        }
     }
 
+    // If not a URI or existingProjectsCreator not found, fall back to picker
     const creator: PythonProjectCreator | undefined = await pickCreator(pc.getProjectCreators());
     if (!creator) {
         return;

src/managers/builtin/sysPythonManager.ts

@@ -199,7 +199,6 @@ export class SysPythonManager implements EnvironmentManager {
         // This environment is unknown. Resolve it.
         const resolved = await resolveSystemPythonEnvironmentPath(context.fsPath, this.nativeFinder, this.api, this);
         if (resolved) {
-            // HERE IT GOT TOO MANY
             // This is just like finding a new environment or creating a new one.
             // Add it to collection, and trigger the added event.
 

src/managers/pyenv/main.ts

@@ -13,10 +13,14 @@ export async function registerPyenvFeatures(
     const api: PythonEnvironmentApi = await getPythonApi();
 
     try {
-        await getPyenv(nativeFinder);
-
-        const mgr = new PyEnvManager(nativeFinder, api);
-        disposables.push(mgr, api.registerEnvironmentManager(mgr));
+        const pyenv = await getPyenv(nativeFinder);
+        
+        if (pyenv) {
+            const mgr = new PyEnvManager(nativeFinder, api);
+            disposables.push(mgr, api.registerEnvironmentManager(mgr));
+        } else {
+            traceInfo('Pyenv not found, turning off pyenv features.');
+        }
     } catch (ex) {
         traceInfo('Pyenv not found, turning off pyenv features.', ex);
     }

src/managers/pyenv/pyenvUtils.ts

@@ -225,8 +225,11 @@ export async function refreshPyenv(
             .filter((e) => !isNativeEnvInfo(e))
             .map((e) => e as NativeEnvManagerInfo)
             .filter((e) => e.tool.toLowerCase() === 'pyenv');
-        pyenv = managers[0].executable;
-        await setPyenv(pyenv);
+        
+        if (managers.length > 0) {
+            pyenv = managers[0].executable;
+            await setPyenv(pyenv);
+        }
     }
 
     const envs = data