Merge branch 'main' into indigo-cow

Author: eleanorjboyd

examples/sample1/src/api.ts

@@ -2,16 +2,16 @@
 // Licensed under the MIT License.
 
 import {
-    Uri,
     Disposable,
-    MarkdownString,
     Event,
+    FileChangeType,
     LogOutputChannel,
-    ThemeIcon,
-    Terminal,
+    MarkdownString,
     TaskExecution,
+    Terminal,
     TerminalOptions,
-    FileChangeType,
+    ThemeIcon,
+    Uri,
 } from 'vscode';
 
 /**
@@ -651,10 +651,6 @@ export interface PythonProject {
      */
     readonly tooltip?: string | MarkdownString;
 
-    /**
-     * The icon path for the Python project, which can be a string, Uri, or an object with light and dark theme paths.
-     */
-    readonly iconPath?: IconPath;
 }
 
 /**
@@ -696,10 +692,6 @@ export interface PythonProjectCreator {
      */
     readonly tooltip?: string | MarkdownString;
 
-    /**
-     * The icon path for the Python project creator, which can be a string, Uri, or an object with light and dark theme paths.
-     */
-    readonly iconPath?: IconPath;
 
     /**
      * Creates a new Python project or projects.

package.json

@@ -160,12 +160,6 @@
                 "category": "Python",
                 "icon": "$(check)"
             },
-            {
-                "command": "python-envs.reset",
-                "title": "%python-envs.reset.title%",
-                "category": "Python",
-                "icon": "$(sync)"
-            },
             {
                 "command": "python-envs.remove",
                 "title": "%python-envs.remove.title%",
@@ -256,6 +250,11 @@
                 "title": "%python-envs.terminal.revertStartupScriptChanges.title%",
                 "category": "Python Envs",
                 "icon": "$(discard)"
+            },
+            {
+                "command": "python-envs.reportIssue",
+                "title": "%python-envs.reportIssue.title%",
+                "category": "Python Environments"
             }
         ],
         "menus": {
@@ -276,10 +275,6 @@
                     "command": "python-envs.setEnv",
                     "when": "false"
                 },
-                {
-                    "command": "python-envs.reset",
-                    "when": "false"
-                },
                 {
                     "command": "python-envs.remove",
                     "when": "false"
@@ -401,10 +396,6 @@
                     "group": "inline",
                     "when": "view == python-projects && viewItem =~ /.*python-workspace.*/"
                 },
-                {
-                    "command": "python-envs.reset",
-                    "when": "view == python-projects && viewItem =~ /.*python-workspace.*/"
-                },
                 {
                     "command": "python-envs.createTerminal",
                     "group": "inline",

package.nls.json

@@ -11,6 +11,7 @@
     "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.",
     "python-envs.terminal.revertStartupScriptChanges.title": "Revert Shell Startup Script Changes",
+    "python-envs.reportIssue.title": "Report Issue",
     "python-envs.setEnvManager.title": "Set Environment Manager",
     "python-envs.setPkgManager.title": "Set Package Manager",
     "python-envs.addPythonProject.title": "Add Python Project",
@@ -22,7 +23,6 @@
     "python-envs.createAny.title": "Create Environment",
     "python-envs.set.title": "Set Project Environment",
     "python-envs.setEnv.title": "Set As Project Environment",
-    "python-envs.reset.title": "Reset to Default",
     "python-envs.remove.title": "Delete Environment",
     "python-envs.refreshAllManagers.title": "Refresh All Environment Managers",
     "python-envs.refreshPackages.title": "Refresh Packages List",

src/api.ts

@@ -650,11 +650,6 @@ export interface PythonProject {
      * The tooltip for the Python project, which can be a string or a Markdown string.
      */
     readonly tooltip?: string | MarkdownString;
-
-    /**
-     * The icon path for the Python project, which can be a string, Uri, or an object with light and dark theme paths.
-     */
-    readonly iconPath?: IconPath;
 }
 
 /**
@@ -701,11 +696,6 @@ export interface PythonProjectCreator {
      */
     readonly tooltip?: string | MarkdownString;
 
-    /**
-     * The icon path for the Python project creator, which can be a string, Uri, or an object with light and dark theme paths.
-     */
-    readonly iconPath?: IconPath;
-
     /**
      * Creates a new Python project(s) or, if files are not a project, returns Uri(s) to the created files.
      * Anything that needs its own python environment constitutes a project.

src/extension.ts

@@ -1,4 +1,4 @@
-import { commands, ExtensionContext, LogOutputChannel, Terminal, Uri, window } from 'vscode';
+import { commands, extensions, ExtensionContext, LogOutputChannel, Terminal, Uri, window, workspace } from 'vscode';
 import { PythonEnvironment, PythonEnvironmentApi, PythonProjectCreator } from './api';
 import { ensureCorrectVersion } from './common/extVersion';
 import { registerLogger, traceError, traceInfo } from './common/logging';
@@ -32,7 +32,6 @@ import {
     refreshPackagesCommand,
     removeEnvironmentCommand,
     removePythonProject,
-    resetEnvironmentCommand,
     runAsTaskCommand,
     runInDedicatedTerminalCommand,
     runInTerminalCommand,
@@ -61,6 +60,7 @@ import { EnvManagerView } from './features/views/envManagersView';
 import { ProjectView } from './features/views/projectView';
 import { PythonStatusBarImpl } from './features/views/pythonStatusBar';
 import { updateViewsAndStatus } from './features/views/revealHandler';
+import { ProjectItem } from './features/views/treeViewItems';
 import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api';
 import { registerSystemPythonFeatures } from './managers/builtin/main';
 import { SysPythonManager } from './managers/builtin/sysPythonManager';
@@ -69,6 +69,85 @@ import { registerCondaFeatures } from './managers/conda/main';
 import { registerPoetryFeatures } from './managers/poetry/main';
 import { registerPyenvFeatures } from './managers/pyenv/main';
 
+/**
+ * Collects relevant Python environment information for issue reporting
+ */
+async function collectEnvironmentInfo(
+    context: ExtensionContext,
+    envManagers: EnvironmentManagers,
+    projectManager: PythonProjectManager
+): Promise<string> {
+    const info: string[] = [];
+    
+    try {
+        // Extension version
+        const extensionVersion = context.extension?.packageJSON?.version || 'unknown';
+        info.push(`Extension Version: ${extensionVersion}`);
+        
+        // Python extension version
+        const pythonExtension = extensions.getExtension('ms-python.python');
+        const pythonVersion = pythonExtension?.packageJSON?.version || 'not installed';
+        info.push(`Python Extension Version: ${pythonVersion}`);
+        
+        // Environment managers
+        const managers = envManagers.managers;
+        info.push(`\nRegistered Environment Managers (${managers.length}):`);
+        managers.forEach(manager => {
+            info.push(`  - ${manager.id} (${manager.displayName})`);
+        });
+        
+        // Available environments
+        const allEnvironments: PythonEnvironment[] = [];
+        for (const manager of managers) {
+            try {
+                const envs = await manager.getEnvironments('all');
+                allEnvironments.push(...envs);
+            } catch (err) {
+                info.push(`  Error getting environments from ${manager.id}: ${err}`);
+            }
+        }
+        
+        info.push(`\nTotal Available Environments: ${allEnvironments.length}`);
+        if (allEnvironments.length > 0) {
+            info.push('Environment Details:');
+            allEnvironments.slice(0, 10).forEach((env, index) => {
+                info.push(`  ${index + 1}. ${env.displayName} (${env.version}) - ${env.displayPath}`);
+            });
+            if (allEnvironments.length > 10) {
+                info.push(`  ... and ${allEnvironments.length - 10} more environments`);
+            }
+        }
+        
+        // Python projects
+        const projects = projectManager.getProjects();
+        info.push(`\nPython Projects (${projects.length}):`);
+        for (let index = 0; index < projects.length; index++) {
+            const project = projects[index];
+            info.push(`  ${index + 1}. ${project.uri.fsPath}`);
+            try {
+                const env = await envManagers.getEnvironment(project.uri);
+                if (env) {
+                    info.push(`     Environment: ${env.displayName}`);
+                }
+            } catch (err) {
+                info.push(`     Error getting environment: ${err}`);
+            }
+        }
+        
+        // Current settings (non-sensitive)
+        const config = workspace.getConfiguration('python-envs');
+        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')}`);
+        
+    } catch (err) {
+        info.push(`\nError collecting environment information: ${err}`);
+    }
+    
+    return info.join('\n');
+}
+
 export async function activate(context: ExtensionContext): Promise<PythonEnvironmentApi> {
     const start = new StopWatch();
 
@@ -119,7 +198,7 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
         projectCreators.registerPythonProjectCreator(new ExistingProjects(projectManager)),
         projectCreators.registerPythonProjectCreator(new AutoFindProjects(projectManager)),
         projectCreators.registerPythonProjectCreator(new NewPackageProject(envManagers, projectManager)),
-        projectCreators.registerPythonProjectCreator(new NewScriptProject()),
+        projectCreators.registerPythonProjectCreator(new NewScriptProject(projectManager)),
     );
 
     setPythonApi(envManagers, projectManager, projectCreators, terminalManager, envVarManager);
@@ -186,9 +265,6 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
         commands.registerCommand('python-envs.setEnv', async (item) => {
             await setEnvironmentCommand(item, envManagers, projectManager);
         }),
-        commands.registerCommand('python-envs.reset', async (item) => {
-            await resetEnvironmentCommand(item, envManagers, projectManager);
-        }),
         commands.registerCommand('python-envs.setEnvManager', async () => {
             await setEnvManagerCommand(envManagers, projectManager);
         }),
@@ -206,7 +282,16 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
             await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators);
         }),
         commands.registerCommand('python-envs.removePythonProject', async (item) => {
-            await resetEnvironmentCommand(item, envManagers, projectManager);
+            // Clear environment association before removing project
+            if (item instanceof ProjectItem) {
+                const uri = item.project.uri;
+                const manager = envManagers.getEnvironmentManager(uri);
+                if (manager) {
+                    manager.set(uri, undefined);
+                } else {
+                    traceError(`No environment manager found for ${uri.fsPath}`);
+                }
+            }
             await removePythonProject(item, projectManager);
         }),
         commands.registerCommand('python-envs.clearCache', async () => {
@@ -278,6 +363,19 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
                 }
             },
         ),
+        commands.registerCommand('python-envs.reportIssue', async () => {
+            try {
+                const issueData = await collectEnvironmentInfo(context, envManagers, projectManager);
+                
+                await commands.executeCommand('workbench.action.openIssueReporter', {
+                    extensionId: 'ms-python.vscode-python-envs',
+                    issueTitle: '[Python Environments] ',
+                    issueBody: `<!-- Please describe the issue you're experiencing -->\n\n<!-- The following information was automatically generated -->\n\n<details>\n<summary>Environment Information</summary>\n\n\`\`\`\n${issueData}\n\`\`\`\n\n</details>`
+                });
+            } catch (error) {
+                window.showErrorMessage(`Failed to open issue reporter: ${error}`);
+            }
+        }),
         terminalActivation.onDidChangeTerminalActivationState(async (e) => {
             await setActivateMenuButtonContext(e.terminal, e.environment, e.activated);
         }),

src/features/creators/newPackageProject.ts

@@ -116,11 +116,6 @@ export class NewPackageProject implements PythonProjectCreator {
             let createdPackage: PythonProject | undefined;
             let createdEnv: PythonEnvironment | undefined;
             if (createVenv) {
-                createdPackage = {
-                    name: packageName,
-                    uri: Uri.file(projectDestinationFolder),
-                };
-
                 // add package to list of packages before creating the venv
                 this.projectManager.add(createdPackage);
                 // gets default environment manager
@@ -178,13 +173,12 @@ export class NewPackageProject implements PythonProjectCreator {
             };
             await manageLaunchJsonFile(destRoot, JSON.stringify(launchJsonConfig));
 
-            if (createdPackage) {
-                // return package if created (ie when venv is created)
-                return createdPackage;
-            } else {
-                // otherwise its not a package and just a folder
-                return Uri.file(projectDestinationFolder);
-            }
+            const createdPackage: PythonProject | undefined = {
+                name: packageName,
+                uri: Uri.file(projectDestinationFolder),
+            };
+            this.projectManager.add(createdPackage);
+            return createdPackage;
         }
         return undefined;
     }

src/features/creators/newScriptProject.ts

@@ -5,6 +5,7 @@ import { PythonProject, PythonProjectCreator, PythonProjectCreatorOptions } from
 import { NEW_PROJECT_TEMPLATES_FOLDER } from '../../common/constants';
 import { traceError } from '../../common/logging';
 import { showInputBoxWithButtons } from '../../common/window.apis';
+import { PythonProjectManager } from '../../internal.api';
 import { isCopilotInstalled, manageCopilotInstructionsFile, replaceInFilesAndNames } from './creationHelpers';
 
 export class NewScriptProject implements PythonProjectCreator {
@@ -13,7 +14,7 @@ export class NewScriptProject implements PythonProjectCreator {
     public readonly description = l10n.t('Creates a new script folder in your current workspace with PEP 723 support');
     public readonly tooltip = new MarkdownString(l10n.t('Create a new Python script'));
 
-    constructor() {}
+    constructor(private readonly projectManager: PythonProjectManager) {}
 
     async create(options?: PythonProjectCreatorOptions): Promise<PythonProject | Uri | undefined> {
         // quick create (needs name, will always create venv and copilot instructions)
@@ -113,7 +114,13 @@ export class NewScriptProject implements PythonProjectCreator {
                 ]);
             }
 
-            return Uri.file(scriptDestination);
+            // Add the created script to the project manager
+            const createdScript: PythonProject | undefined = {
+                name: scriptFileName,
+                uri: Uri.file(scriptDestination),
+            };
+            this.projectManager.add(createdScript);
+            return createdScript;
         }
         return undefined;
     }

src/features/envCommands.ts

@@ -329,35 +329,6 @@ async function setEnvironmentForProjects(
     await em.setEnvironments(uris, environment);
 }
 
-export async function resetEnvironmentCommand(
-    context: unknown,
-    em: EnvironmentManagers,
-    wm: PythonProjectManager,
-): Promise<void> {
-    if (context instanceof ProjectItem) {
-        const view = context as ProjectItem;
-        return resetEnvironmentCommand(view.project.uri, em, wm);
-    } else if (context instanceof Uri) {
-        const uri = context as Uri;
-        const manager = em.getEnvironmentManager(uri);
-        if (manager) {
-            manager.set(uri, undefined);
-        } else {
-            showErrorMessage(`No environment manager found for: ${uri.fsPath}`);
-            traceError(`No environment manager found for ${uri.fsPath}`);
-        }
-        return;
-    } else if (context === undefined) {
-        const pw = await pickProject(wm.getProjects());
-        if (pw) {
-            return resetEnvironmentCommand(pw.uri, em, wm);
-        }
-        return;
-    }
-    traceError(`Invalid context for unset environment command: ${context}`);
-    showErrorMessage('Invalid context for unset environment');
-}
-
 export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise<void> {
     const projects = await pickProjectMany(wm.getProjects());
     if (projects && projects.length > 0) {