fix: activation commands for pyenv

Author: karthiknadig

src/managers/pyenv/pyenvManager.ts

@@ -321,24 +321,11 @@ export class PyEnvManager implements EnvironmentManager, Disposable {
         return undefined;
     }
 
-    private getProjectsForEnvironment(environment: PythonEnvironment): PythonProject[] {
-        return Array.from(this.fsPathToEnv.entries())
-            .filter(([, env]) => env === environment)
-            .map(([uri]) => this.api.getPythonProject(Uri.file(uri)))
-            .filter((project) => project !== undefined) as PythonProject[];
-    }
-
     private findEnvironmentByPath(fsPath: string): PythonEnvironment | undefined {
         const normalized = path.normalize(fsPath);
         return this.collection.find((e) => {
             const n = path.normalize(e.environmentPath.fsPath);
             return n === normalized || path.dirname(n) === normalized || path.dirname(path.dirname(n)) === normalized;
         });
     }
-
-    private findEnvironmentByName(name: string): PythonEnvironment | undefined {
-        return this.collection.find((e) => {
-            return e.name === name;
-        });
-    }
 }

src/managers/pyenv/pyenvUtils.ts

@@ -14,15 +14,14 @@ import { traceError, traceInfo } from '../../common/logging';
 import { getGlobalPersistentState, getWorkspacePersistentState } from '../../common/persistentState';
 import { getUserHomeDir, normalizePath, untildify } from '../../common/utils/pathUtils';
 import { isWindows } from '../../common/utils/platformUtils';
-import { ShellConstants } from '../../features/common/shellConstants';
 import {
     isNativeEnvInfo,
     NativeEnvInfo,
     NativeEnvManagerInfo,
     NativePythonEnvironmentKind,
     NativePythonFinder,
 } from '../common/nativePythonFinder';
-import { pathForGitBash, shortVersion, sortEnvironments } from '../common/utils';
+import { shortVersion, sortEnvironments } from '../common/utils';
 
 async function findPyenv(): Promise<string | undefined> {
     try {
@@ -186,15 +185,8 @@ function nativeToPythonEnv(
     const shellActivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
     const shellDeactivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
 
-    shellActivation.set('unknown', [{ executable: pyenv, args: ['shell', name] }]);
-    shellDeactivation.set('unknown', [{ executable: pyenv, args: ['shell', '--unset'] }]);
-
-    if (isWindows()) {
-        shellActivation.set(ShellConstants.GITBASH, [{ executable: pathForGitBash(pyenv), args: ['shell', name] }]);
-        shellDeactivation.set(ShellConstants.GITBASH, [
-            { executable: pathForGitBash(pyenv), args: ['shell', '--unset'] },
-        ]);
-    }
+    shellActivation.set('unknown', [{ executable: 'pyenv', args: ['shell', name] }]);
+    shellDeactivation.set('unknown', [{ executable: 'pyenv', args: ['shell', '--unset'] }]);
 
     const environment: PythonEnvironmentInfo = {
         name: name,
@@ -237,25 +229,23 @@ export async function refreshPyenv(
         await setPyenv(pyenv);
     }
 
-    if (pyenv) {
-        const envs = data
-            .filter((e) => isNativeEnvInfo(e))
-            .map((e) => e as NativeEnvInfo)
-            .filter((e) => e.kind === NativePythonEnvironmentKind.pyenv);
-        const collection: PythonEnvironment[] = [];
+    const envs = data
+        .filter((e) => isNativeEnvInfo(e))
+        .map((e) => e as NativeEnvInfo)
+        .filter((e) => e.kind === NativePythonEnvironmentKind.pyenv);
 
-        envs.forEach((e) => {
+    const collection: PythonEnvironment[] = [];
+
+    envs.forEach((e) => {
+        if (pyenv) {
             const environment = nativeToPythonEnv(e, api, manager, pyenv);
             if (environment) {
                 collection.push(environment);
             }
-        });
-
-        return sortEnvironments(collection);
-    }
+        }
+    });
 
-    traceError('Pyenv not found');
-    return [];
+    return sortEnvironments(collection);
 }
 
 export async function resolvePyenvPath(