Merge branch 'main' into copilot/fix-478

Author: eleanorjboyd

src/common/pickers/managers.ts

@@ -1,4 +1,4 @@
-import { commands, QuickInputButtons, QuickPickItem, QuickPickItemKind } from 'vscode';
+import { commands, QuickInputButtons, QuickPickItem, QuickPickItemKind, workspace, WorkspaceFolder } from 'vscode';
 import { PythonProjectCreator } from '../../api';
 import { InternalEnvironmentManager, InternalPackageManager } from '../../internal.api';
 import { Common, Pickers } from '../localize';
@@ -125,6 +125,31 @@ export async function pickPackageManager(
     return (item as QuickPickItem & { id: string })?.id;
 }
 
+export async function pickWorkspaceFolder(showBackButton = true): Promise<WorkspaceFolder | undefined> {
+    const folders = workspace.workspaceFolders;
+    if (!folders || folders.length === 0) {
+        return undefined;
+    }
+    if (folders.length === 1) {
+        return folders[0];
+    }
+    const items = folders.map((f) => ({
+        label: f.name,
+        description: f.uri.fsPath,
+        folder: f,
+    }));
+
+    const selected = await showQuickPickWithButtons(items, {
+        placeHolder: 'Select a workspace folder',
+        ignoreFocusOut: true,
+        showBackButton,
+    });
+    if (!selected) {
+        return undefined;
+    }
+    const selectedItem = Array.isArray(selected) ? selected[0] : selected;
+    return selectedItem?.folder;
+}
 export async function pickCreator(creators: PythonProjectCreator[]): Promise<PythonProjectCreator | undefined> {
     if (creators.length === 0) {
         return;

src/features/envCommands.ts

@@ -1,4 +1,4 @@
-import { commands, QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri } from 'vscode';
+import { commands, QuickInputButtons, TaskExecution, TaskRevealKind, Terminal, Uri, workspace } from 'vscode';
 import {
     CreateEnvironmentOptions,
     PythonEnvironment,
@@ -20,7 +20,12 @@ import { removePythonProjectSetting, setEnvironmentManager, setPackageManager }
 import { clipboardWriteText } from '../common/env.apis';
 import {} from '../common/errors/utils';
 import { pickEnvironment } from '../common/pickers/environments';
-import { pickCreator, pickEnvironmentManager, pickPackageManager } from '../common/pickers/managers';
+import {
+    pickCreator,
+    pickEnvironmentManager,
+    pickPackageManager,
+    pickWorkspaceFolder,
+} from '../common/pickers/managers';
 import { pickProject, pickProjectMany } from '../common/pickers/projects';
 import { activeTextEditor, showErrorMessage, showInformationMessage, showTextDocument } from '../common/window.apis';
 import { quoteArgs } from './execution/execUtils';
@@ -451,6 +456,20 @@ export async function addPythonProjectCommand(
         return;
     }
 
+    // if multiroot, prompt the user to select which workspace to create the project in
+    const workspaceFolders = workspace.workspaceFolders;
+    if (!resource && workspaceFolders && workspaceFolders.length > 1) {
+        try {
+            const workspace = await pickWorkspaceFolder(true);
+            resource = workspace?.uri;
+        } catch (ex) {
+            if (ex === QuickInputButtons.Back) {
+                return addPythonProjectCommand(resource, wm, em, pc);
+            }
+            throw ex;
+        }
+    }
+
     try {
         const result = await creator.create(options);
         if (result instanceof Uri) {

src/managers/builtin/venvManager.ts

@@ -171,7 +171,10 @@ export class VenvManager implements EnvironmentManager {
         try {
             this.skipWatcherRefresh = true;
 
-            await removeVenv(environment, this.log);
+            const isRemoved = await removeVenv(environment, this.log);
+            if (!isRemoved) {
+                return;
+            }
             this.updateCollection(environment);
             this._onDidChangeEnvironments.fire([{ environment, kind: EnvironmentChangeKind.remove }]);
 

src/managers/builtin/venvUtils.ts

@@ -11,6 +11,7 @@ import {
 } from '../../api';
 import { ENVS_EXTENSION_ID } from '../../common/constants';
 import { Common, VenvManagerStrings } from '../../common/localize';
+import { traceInfo } from '../../common/logging';
 import { getWorkspacePersistentState } from '../../common/persistentState';
 import { pickEnvironmentFrom } from '../../common/pickers/environments';
 import { EventNames } from '../../common/telemetry/constants';
@@ -561,7 +562,7 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC
         { title: Common.no, isCloseAffordance: true },
     );
     if (confirm?.title === Common.yes) {
-        await withProgress(
+        const result = await withProgress(
             {
                 location: ProgressLocation.Notification,
                 title: VenvManagerStrings.venvRemoving,
@@ -577,8 +578,10 @@ export async function removeVenv(environment: PythonEnvironment, log: LogOutputC
                 }
             },
         );
+        return result;
     }
 
+    traceInfo(`User cancelled removal of virtual environment: ${envPath}`);
     return false;
 }