fix: multi-root workspace env selection (partial fix) (#375)

Author: karthiknadig

package.json

@@ -56,7 +56,7 @@
                     "type": "array",
                     "default": [],
                     "description": "%python-envs.pythonProjects.description%",
-                    "scope": "window",
+                    "scope": "resource",
                     "items": {
                         "type": "object",
                         "properties": {

src/common/workspace.apis.ts

@@ -22,6 +22,10 @@ export function getWorkspaceFolders(): readonly WorkspaceFolder[] | undefined {
     return workspace.workspaceFolders;
 }
 
+export function getWorkspaceFile(): Uri | undefined {
+    return workspace.workspaceFile;
+}
+
 export function getConfiguration(section?: string, scope?: ConfigurationScope | null): WorkspaceConfiguration {
     return workspace.getConfiguration(section, scope);
 }

src/features/projectManager.ts

@@ -52,10 +52,16 @@ export class PythonProjectManagerImpl implements PythonProjectManager {
         for (const w of workspaces) {
             const config = getConfiguration('python-envs', w.uri);
             const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
-            newProjects.push(new PythonProjectsImpl(w.name, w.uri));
+
+            if (!newProjects.some((p) => p.uri.toString() === w.uri.toString())) {
+                newProjects.push(new PythonProjectsImpl(w.name, w.uri));
+            }
+
             for (const o of overrides) {
                 const uri = Uri.file(path.resolve(w.uri.fsPath, o.path));
-                newProjects.push(new PythonProjectsImpl(o.path, uri));
+                if (!newProjects.some((p) => p.uri.toString() === uri.toString())) {
+                    newProjects.push(new PythonProjectsImpl(o.path, uri));
+                }
             }
         }
         return newProjects;
@@ -69,10 +75,15 @@ export class PythonProjectManagerImpl implements PythonProjectManager {
         for (const w of workspaces) {
             const config = getConfiguration('python-envs', w.uri);
             const overrides = config.get<PythonProjectSettings[]>('pythonProjects', []);
-            newProjects.push(new PythonProjectsImpl(w.name, w.uri));
+
+            if (!newProjects.some((p) => p.uri.toString() === w.uri.toString())) {
+                newProjects.push(new PythonProjectsImpl(w.name, w.uri));
+            }
             for (const o of overrides) {
                 const uri = Uri.file(path.resolve(w.uri.fsPath, o.path));
-                newProjects.push(new PythonProjectsImpl(o.path, uri));
+                if (!newProjects.some((p) => p.uri.toString() === uri.toString())) {
+                    newProjects.push(new PythonProjectsImpl(o.path, uri));
+                }
             }
         }
 

src/features/settings/settingHelpers.ts

@@ -7,10 +7,11 @@ import {
     WorkspaceConfiguration,
     WorkspaceFolder,
 } from 'vscode';
-import { PythonProjectManager, PythonProjectSettings } from '../../internal.api';
-import { traceError, traceInfo } from '../../common/logging';
 import { PythonProject } from '../../api';
 import { DEFAULT_ENV_MANAGER_ID, DEFAULT_PACKAGE_MANAGER_ID } from '../../common/constants';
+import { traceError, traceInfo } from '../../common/logging';
+import { getWorkspaceFile } from '../../common/workspace.apis';
+import { PythonProjectManager, PythonProjectSettings } from '../../internal.api';
 
 function getSettings(
     wm: PythonProjectManager,
@@ -105,6 +106,7 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr
         }
     });
 
+    const workspaceFile = getWorkspaceFile();
     const promises: Thenable<void>[] = [];
 
     workspaces.forEach((es, w) => {
@@ -116,6 +118,12 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr
             if (index >= 0) {
                 overrides[index].envManager = e.envManager;
                 overrides[index].packageManager = e.packageManager;
+            } else if (workspaceFile) {
+                overrides.push({
+                    path: path.relative(w.uri.fsPath, pwPath).replace(/\\/g, '/'),
+                    envManager: e.envManager,
+                    packageManager: e.packageManager,
+                });
             } else {
                 if (config.get('defaultEnvManager') !== e.envManager) {
                     promises.push(config.update('defaultEnvManager', e.envManager, ConfigurationTarget.Workspace));
@@ -127,7 +135,13 @@ export async function setAllManagerSettings(edits: EditAllManagerSettings[]): Pr
                 }
             }
         });
-        promises.push(config.update('pythonProjects', overrides, ConfigurationTarget.Workspace));
+        promises.push(
+            config.update(
+                'pythonProjects',
+                overrides,
+                workspaceFile ? ConfigurationTarget.WorkspaceFolder : ConfigurationTarget.Workspace,
+            ),
+        );
     });
 
     const config = workspace.getConfiguration('python-envs', undefined);