De-duplicate directories at the very end in Global virtual env locators

karrtikr · Sep 20, 2023 · 3801a70 · 3801a70
1 parent f38ea44
commit 3801a70
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/client/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvronmentLocator.ts b/src/client/pythonEnvironments/base/locators/lowLevel/globalVirtualEnvronmentLocator.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { uniq } from 'lodash';
+import { toLower, uniq, uniqBy } from 'lodash';
 import * as path from 'path';
 import { chain, iterable } from '../../../../common/utils/async';
 import { getEnvironmentVariable, getOSType, getUserHomeDir, OSType } from '../../../../common/utils/platform';
@@ -39,19 +39,22 @@ async function getGlobalVirtualEnvDirs(): Promise<string[]> {
 
     const homeDir = getUserHomeDir();
     if (homeDir && (await pathExists(homeDir))) {
-        const subDirs = ['Envs', '.direnv', '.venvs', '.virtualenvs', path.join('.local', 'share', 'virtualenvs')];
-        if (![OSType.Windows, OSType.OSX].includes(getOSType())) {
-            // Not a case insensitive platform, push both upper and lower cases.
-            subDirs.push('envs');
-        }
+        const subDirs = [
+            'envs',
+            'Envs',
+            '.direnv',
+            '.venvs',
+            '.virtualenvs',
+            path.join('.local', 'share', 'virtualenvs'),
+        ];
         const filtered = await asyncFilter(
             subDirs.map((d) => path.join(homeDir, d)),
             pathExists,
         );
         filtered.forEach((d) => venvDirs.push(d));
     }
 
-    return uniq(venvDirs);
+    return [OSType.Windows, OSType.OSX].includes(getOSType()) ? uniqBy(venvDirs, toLower) : uniq(venvDirs);
 }
 
 /**