Handle resolving environment path

Author: Kartik Raj

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

@@ -19,7 +19,11 @@ import {
 import { PythonEnvsChangedEvent } from '../../watcher';
 import { resolveBasicEnv } from './resolverUtils';
 import { traceVerbose } from '../../../../logging';
-import { isExecutableOrEnvPath } from '../../../common/commonUtils';
+import {
+    getEnvironmentDirFromPath,
+    getInterpreterPathFromDir,
+    isExecutableOrEnvPath,
+} from '../../../common/commonUtils';
 
 /**
  * Calls environment info service which runs `interpreterInfo.py` script on environments received
@@ -36,16 +40,9 @@ export class PythonEnvsResolver implements IResolvingLocator {
     ) {}
 
     public async resolveEnv(path: string): Promise<PythonEnvInfo | undefined> {
+        const [executablePath, envPath] = await getExecutablePathAndEnvPath(path);
+        path = executablePath.length ? executablePath : envPath;
         const kind = await identifyEnvironment(path);
-        let envPath: string;
-        let executablePath: string;
-        if (await isExecutableOrEnvPath(path)) {
-            executablePath = path;
-            envPath = '';
-        } else {
-            executablePath = '';
-            envPath = path;
-        }
         const environment = await resolveBasicEnv({ kind, executablePath, envPath });
         const info = await this.environmentInfoService.getEnvironmentInfo(environment);
         if (!info) {
@@ -160,3 +157,17 @@ function getResolvedEnv(interpreterInfo: InterpreterInformation, environment: Py
     setEnvDisplayString(resolvedEnv);
     return resolvedEnv;
 }
+
+async function getExecutablePathAndEnvPath(path: string) {
+    let executablePath: string;
+    let envPath: string;
+    const isPathAnExecutable = await isExecutableOrEnvPath(path);
+    if (isPathAnExecutable) {
+        executablePath = path;
+        envPath = getEnvironmentDirFromPath(path);
+    } else {
+        executablePath = (await getInterpreterPathFromDir(path)) ?? '';
+        envPath = path;
+    }
+    return [executablePath, envPath];
+}

src/client/pythonEnvironments/common/environmentIdentifier.ts

@@ -38,15 +38,15 @@ function getIdentifiers(): Map<PythonEnvKind, (path: string) => Promise<boolean>
 
 /**
  * Returns environment type.
- * @param {string} interpreterPath : Absolute path to the python interpreter binary.
+ * @param {string} path : Absolute path to the python interpreter binary or path to environment.
  * @returns {PythonEnvKind}
  */
-export async function identifyEnvironment(interpreterPath: string): Promise<PythonEnvKind> {
+export async function identifyEnvironment(path: string): Promise<PythonEnvKind> {
     const identifiers = getIdentifiers();
     const prioritizedEnvTypes = getPrioritizedEnvKinds();
     for (const e of prioritizedEnvTypes) {
         const identifier = identifiers.get(e);
-        if (identifier && (await identifier(interpreterPath))) {
+        if (identifier && (await identifier(path))) {
             return e;
         }
     }