switch to async

Author: eleanorjboyd

src/managers/conda/condaUtils.ts

@@ -280,13 +280,13 @@ function isPrefixOf(roots: string[], e: string): boolean {
     return false;
 }
 
-function getNamedCondaPythonInfo(
+async function getNamedCondaPythonInfo(
     name: string,
     prefix: string,
     executable: string,
     version: string,
     conda: string,
-): PythonEnvironmentInfo {
+): Promise<PythonEnvironmentInfo> {
     const sv = shortVersion(version);
     const shellActivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
     const shellDeactivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
@@ -323,7 +323,7 @@ function getNamedCondaPythonInfo(
             ]);
             shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]);
         }
-        const psActivate = getCondaHookPs1Path(conda);
+        const psActivate = await getCondaHookPs1Path(conda);
         shellActivation.set(ShellConstants.PWSH, [
             { executable: '&', args: [psActivate] },
             { executable: 'conda', args: ['activate', name] },
@@ -374,12 +374,12 @@ function getNamedCondaPythonInfo(
     };
 }
 
-function getPrefixesCondaPythonInfo(
+async function getPrefixesCondaPythonInfo(
     prefix: string,
     executable: string,
     version: string,
     conda: string,
-): PythonEnvironmentInfo {
+): Promise<PythonEnvironmentInfo> {
     const sv = shortVersion(version);
     const shellActivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
     const shellDeactivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
@@ -416,7 +416,7 @@ function getPrefixesCondaPythonInfo(
             ]);
             shellDeactivation.set(ShellConstants.ZSH, [{ executable: 'conda', args: ['deactivate'] }]);
         }
-        const psActivate = getCondaHookPs1Path(conda);
+        const psActivate = await getCondaHookPs1Path(conda);
         shellActivation.set(ShellConstants.PWSH, [
             { executable: '&', args: [psActivate] },
             { executable: 'conda', args: ['activate', prefix] },
@@ -487,14 +487,14 @@ function getCondaWithoutPython(name: string, prefix: string, conda: string): Pyt
     };
 }
 
-function nativeToPythonEnv(
+async function nativeToPythonEnv(
     e: NativeEnvInfo,
     api: PythonEnvironmentApi,
     manager: EnvironmentManager,
     log: LogOutputChannel,
     conda: string,
     condaPrefixes: string[],
-): PythonEnvironment | undefined {
+): Promise<PythonEnvironment | undefined> {
     if (!(e.prefix && e.executable && e.version)) {
         let name = e.name;
         const environment = api.createPythonEnvironmentItem(
@@ -507,14 +507,14 @@ function nativeToPythonEnv(
 
     if (e.name === 'base') {
         const environment = api.createPythonEnvironmentItem(
-            getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda),
+            await getNamedCondaPythonInfo('base', e.prefix, e.executable, e.version, conda),
             manager,
         );
         log.info(`Found base environment: ${e.prefix}`);
         return environment;
     } else if (!isPrefixOf(condaPrefixes, e.prefix)) {
         const environment = api.createPythonEnvironmentItem(
-            getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda),
+            await getPrefixesCondaPythonInfo(e.prefix, e.executable, e.version, conda),
             manager,
         );
         log.info(`Found prefix environment: ${e.prefix}`);
@@ -523,7 +523,7 @@ function nativeToPythonEnv(
         const basename = path.basename(e.prefix);
         const name = e.name ?? basename;
         const environment = api.createPythonEnvironmentItem(
-            getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda),
+            await getNamedCondaPythonInfo(name, e.prefix, e.executable, e.version, conda),
             manager,
         );
         log.info(`Found named environment: ${e.prefix}`);
@@ -586,8 +586,8 @@ export async function refreshCondaEnvs(
             .filter((e) => e.kind === NativePythonEnvironmentKind.conda);
         const collection: PythonEnvironment[] = [];
 
-        envs.forEach((e) => {
-            const environment = nativeToPythonEnv(e, api, manager, log, condaPath, condaPrefixes);
+        envs.forEach(async (e) => {
+            const environment = await nativeToPythonEnv(e, api, manager, log, condaPath, condaPrefixes);
             if (environment) {
                 collection.push(environment);
             }
@@ -699,7 +699,7 @@ async function createNamedCondaEnvironment(
                 const version = await getVersion(envPath);
 
                 const environment = api.createPythonEnvironmentItem(
-                    getNamedCondaPythonInfo(envName, envPath, path.join(envPath, bin), version, await getConda()),
+                    await getNamedCondaPythonInfo(envName, envPath, path.join(envPath, bin), version, await getConda()),
                     manager,
                 );
                 return environment;
@@ -757,7 +757,7 @@ async function createPrefixCondaEnvironment(
                 const version = await getVersion(prefix);
 
                 const environment = api.createPythonEnvironmentItem(
-                    getPrefixesCondaPythonInfo(prefix, path.join(prefix, bin), version, await getConda()),
+                    await getPrefixesCondaPythonInfo(prefix, path.join(prefix, bin), version, await getConda()),
                     manager,
                 );
                 return environment;
@@ -1062,25 +1062,32 @@ export async function checkForNoPythonCondaEnvironment(
  *   - condabin/
  *   - etc/profile.d/
  */
-function getCondaHookPs1Path(condaPath: string): string {
+async function getCondaHookPs1Path(condaPath: string): Promise<string> {
     const condaRoot = path.dirname(path.dirname(condaPath));
 
-    let condaRootCandidates: string[] = [];
-    condaRootCandidates.push(path.join(condaRoot, 'shell', 'condabin'));
-    condaRootCandidates.push(path.join(condaRoot, 'Library', 'shell', 'condabin'));
-    condaRootCandidates.push(path.join(condaRoot, 'condabin'));
-    condaRootCandidates.push(path.join(condaRoot, 'etc', 'profile.d'));
+    const condaRootCandidates: string[] = [
+        path.join(condaRoot, 'shell', 'condabin'),
+        path.join(condaRoot, 'Library', 'shell', 'condabin'),
+        path.join(condaRoot, 'condabin'),
+        path.join(condaRoot, 'etc', 'profile.d'),
+    ];
 
-    for (const hookSearchDir of condaRootCandidates) {
+    const checks = condaRootCandidates.map(async (hookSearchDir) => {
         const candidate = path.join(hookSearchDir, 'conda-hook.ps1');
-        if (fse.existsSync(candidate)) {
+        if (await fse.pathExists(candidate)) {
             traceInfo(`Conda hook found at: ${candidate}`);
             return candidate;
         }
+        return undefined;
+    });
+    const results = await Promise.all(checks);
+    const found = results.find(Boolean);
+    if (found) {
+        return found as string;
     }
     throw new Error(
         `Conda hook not found in expected locations. Tried: ${condaRootCandidates.join(
             ', ',
         )} based on conda executable at ${condaPath}.`,
-    ); // Throw an error if not found
+    );
 }