Identify base conda environments inside pyenv correctly (#18570)

* Assign env name

* VSIX

* Revert "VSIX"

This reverts commit 7442e67.

* Add tests

* News entry

Author: Kartik Raj

news/2 Fixes/18500.md

@@ -0,0 +1 @@
+Identify base conda environments inside pyenv correctly.

src/client/pythonEnvironments/base/locators/composite/resolverUtils.ts

@@ -12,8 +12,8 @@ import {
     getPythonVersionFromPath,
 } from '../../../common/commonUtils';
 import { arePathsSame, getWorkspaceFolders, isParentPath } from '../../../common/externalDependencies';
-import { AnacondaCompanyName, Conda } from '../../../common/environmentManagers/conda';
-import { parsePyenvVersion } from '../../../common/environmentManagers/pyenv';
+import { AnacondaCompanyName, Conda, isCondaEnvironment } from '../../../common/environmentManagers/conda';
+import { getPyenvVersionsDir, parsePyenvVersion } from '../../../common/environmentManagers/pyenv';
 import { Architecture, getOSType, OSType } from '../../../../common/utils/platform';
 import { getPythonVersionFromPath as parsePythonVersionFromPath, parseVersion } from '../../info/pythonVersion';
 import { getRegistryInterpreters, getRegistryInterpretersSync } from '../../../common/windowsUtils';
@@ -195,10 +195,23 @@ async function resolvePyenvEnv(executablePath: string): Promise<PythonEnvInfo> {
         org: versionStrings && versionStrings.distro ? versionStrings.distro : '',
     });
 
-    envInfo.name = name;
+    if (await isBaseCondaPyenvEnvironment(executablePath)) {
+        envInfo.name = 'base';
+    } else {
+        envInfo.name = name;
+    }
     return envInfo;
 }
 
+async function isBaseCondaPyenvEnvironment(executablePath: string) {
+    if (!(await isCondaEnvironment(executablePath))) {
+        return false;
+    }
+    const location = getEnvironmentDirFromPath(executablePath);
+    const pyenvVersionDir = getPyenvVersionsDir();
+    return arePathsSame(path.dirname(location), pyenvVersionDir);
+}
+
 async function resolveWindowsStoreEnv(executablePath: string): Promise<PythonEnvInfo> {
     return buildEnvInfo({
         kind: PythonEnvKind.WindowsStore,

src/client/pythonEnvironments/base/locators/lowLevel/pyenvLocator.ts

@@ -1,19 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import * as path from 'path';
 import { PythonEnvKind } from '../../info';
 import { BasicEnvInfo, IPythonEnvsIterator } from '../../locator';
 import { FSWatchingLocator } from './fsWatchingLocator';
 import { getInterpreterPathFromDir } from '../../../common/commonUtils';
 import { getSubDirs } from '../../../common/externalDependencies';
-import { getPyenvDir } from '../../../common/environmentManagers/pyenv';
+import { getPyenvVersionsDir } from '../../../common/environmentManagers/pyenv';
 import { traceError } from '../../../../logging';
 
-function getPyenvVersionsDir(): string {
-    return path.join(getPyenvDir(), 'versions');
-}
-
 /**
  * Gets all the pyenv environments.
  *

src/client/pythonEnvironments/common/environmentManagers/pyenv.ts

@@ -19,6 +19,11 @@ export function getPyenvDir(): string {
 
     return pyenvDir;
 }
+
+export function getPyenvVersionsDir(): string {
+    return path.join(getPyenvDir(), 'versions');
+}
+
 /**
  * Checks if a given directory path is same as `pyenv` shims path. This checks
  * `~/.pyenv/shims` on posix and `~/.pyenv/pyenv-win/shims` on windows.

src/test/pythonEnvironments/base/locators/composite/resolverUtils.unit.test.ts

@@ -48,7 +48,7 @@ suite('Resolver Utils', () => {
         teardown(() => {
             sinon.restore();
         });
-        function getExpectedPyenvInfo(): PythonEnvInfo | undefined {
+        function getExpectedPyenvInfo1(): PythonEnvInfo | undefined {
             const envInfo = buildEnvInfo({
                 kind: PythonEnvKind.Pyenv,
                 executable: path.join(testPyenvVersionsDir, '3.9.0', 'bin', 'python'),
@@ -65,9 +65,36 @@ suite('Resolver Utils', () => {
             return envInfo;
         }
 
+        function getExpectedPyenvInfo2(): PythonEnvInfo | undefined {
+            const envInfo = buildEnvInfo({
+                kind: PythonEnvKind.Pyenv,
+                executable: path.join(testPyenvVersionsDir, 'miniconda3-4.7.12', 'bin', 'python'),
+                version: {
+                    major: 3,
+                    minor: 7,
+                    micro: -1,
+                },
+                source: [],
+                org: 'miniconda3',
+            });
+            envInfo.location = path.join(testPyenvVersionsDir, 'miniconda3-4.7.12');
+            envInfo.name = 'base';
+            setEnvDisplayString(envInfo);
+            return envInfo;
+        }
+
         test('resolveEnv', async () => {
             const executablePath = path.join(testPyenvVersionsDir, '3.9.0', 'bin', 'python');
-            const expected = getExpectedPyenvInfo();
+            const expected = getExpectedPyenvInfo1();
+
+            const actual = await resolveBasicEnv({ executablePath, kind: PythonEnvKind.Pyenv });
+            assertEnvEqual(actual, expected);
+        });
+
+        test('resolveEnv (base conda env)', async () => {
+            sinon.stub(platformApis, 'getOSType').callsFake(() => platformApis.OSType.Linux);
+            const executablePath = path.join(testPyenvVersionsDir, 'miniconda3-4.7.12', 'bin', 'python');
+            const expected = getExpectedPyenvInfo2();
 
             const actual = await resolveBasicEnv({ executablePath, kind: PythonEnvKind.Pyenv });
             assertEnvEqual(actual, expected);