fix up

eleanorjboyd · eleanorjboyd · commit ba39d4030c25 · 2025-08-08T13:28:44.000-07:00
diff --git a/src/managers/conda/condaSourcingUtils.ts b/src/managers/conda/condaSourcingUtils.ts
@@ -89,7 +89,7 @@ export async function constructCondaSourcingStatus(condaPath: string): Promise<C
     const globalSourcingScript: string | undefined = await findGlobalSourcingScript(sourcingStatus.condaFolder);
     if (globalSourcingScript) {
         sourcingStatus.globalSourcingScript = globalSourcingScript;
-        // TODO: determine if we want to exit here or continue to generate all the other activation scripts
+        // note: future iterations could decide to exit here instead of continuing to generate all the other activation scripts
     }
 
     // find and save all of the shell specific sourcing scripts
@@ -111,19 +111,18 @@ export async function findGlobalSourcingScript(condaFolder: string): Promise<str
         ? path.join(condaFolder, 'Scripts', 'activate.bat')
         : path.join(condaFolder, 'bin', 'activate');
 
-    traceVerbose(`Checking for global conda sourcing script at: ${sourcingScript}`);
     if (await fse.pathExists(sourcingScript)) {
         traceInfo(`Found global conda sourcing script at: ${sourcingScript}`);
         return sourcingScript;
     } else {
-        traceInfo(`No global conda sourcing script found.`);
+        traceInfo(`No global conda sourcing script found.  at: ${sourcingScript}`);
         return undefined;
     }
 }
 
 export async function findShellSourcingScripts(sourcingStatus: CondaSourcingStatus): Promise<string[]> {
     const logs: string[] = [];
-    logs.push('=== Conda Shell Script Search ===');
+    logs.push('=== Conda Sourcing Shell Script Search ===');
 
     let ps1Script: string | undefined;
     let shScript: string | undefined;
@@ -134,37 +133,32 @@ export async function findShellSourcingScripts(sourcingStatus: CondaSourcingStat
         logs.push('Searching for PowerShell hook script...');
         try {
             ps1Script = await getCondaHookPs1Path(sourcingStatus.condaFolder);
-            logs.push(`  Status: ${ps1Script ? '✓ Found' : '✗ Not found'}`);
-            logs.push(`  Path: ${ps1Script ?? 'N/A'}`);
+            logs.push(`  Path: ${ps1Script ?? '✗ Not found'}`);
         } catch (err) {
             logs.push(
-                `  ⚠️ Error during PowerShell script search: ${err instanceof Error ? err.message : 'Unknown error'}`,
+                `  Error during PowerShell script search: ${err instanceof Error ? err.message : 'Unknown error'}`,
             );
         }
 
         // Search for Shell script (conda.sh)
         logs.push('\nSearching for Shell script...');
         try {
             shScript = await getCondaShPath(sourcingStatus.condaFolder);
-            logs.push(`  Status: ${shScript ? '✓ Found' : '✗ Not found'}`);
-            logs.push(`  Path: ${shScript ?? 'N/A'}`);
+            logs.push(`  Path: ${shScript ?? '✗ Not found'}`);
         } catch (err) {
-            logs.push(`  ⚠️ Error during Shell script search: ${err instanceof Error ? err.message : 'Unknown error'}`);
+            logs.push(`  Error during Shell script search: ${err instanceof Error ? err.message : 'Unknown error'}`);
         }
 
         // Search for Windows CMD script (activate.bat)
         logs.push('\nSearching for Windows CMD script...');
         try {
             cmdActivate = await getCondaBatActivationFile(sourcingStatus.condaPath);
-            logs.push(`  Status: ${cmdActivate ? '✓ Found' : '✗ Not found'}`);
-            logs.push(`  Path: ${cmdActivate ?? 'N/A'}`);
+            logs.push(`  Path: ${cmdActivate ?? '✗ Not found'}`);
         } catch (err) {
-            logs.push(`  ⚠️ Error during CMD script search: ${err instanceof Error ? err.message : 'Unknown error'}`);
+            logs.push(`  Error during CMD script search: ${err instanceof Error ? err.message : 'Unknown error'}`);
         }
     } catch (error) {
-        logs.push(
-            `\n❌ Critical error during script search: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        );
+        logs.push(`\nCritical error during script search: ${error instanceof Error ? error.message : 'Unknown error'}`);
     } finally {
         logs.push('\nSearch Summary:');
         logs.push(`  PowerShell: ${ps1Script ? '✓' : '✗'}`);
@@ -189,8 +183,6 @@ export async function findShellSourcingScripts(sourcingStatus: CondaSourcingStat
  *   - etc/profile.d/
  */
 export async function getCondaHookPs1Path(condaFolder: string): Promise<string | undefined> {
-    // Check cache first
-
     // Create the promise for finding the hook path
     const hookPathPromise = (async () => {
         const condaRootCandidates: string[] = [
@@ -216,7 +208,6 @@ export async function getCondaHookPs1Path(condaFolder: string): Promise<string |
         return undefined;
     })();
 
-    // Store in cache and return
     return hookPathPromise;
 }
 
@@ -325,11 +316,6 @@ async function getCondaBatActivationFile(condaPath: string): Promise<string | un
 
 const knownSourcingScriptCache: string[] = [];
 export async function getLocalActivationScript(condaPath: string): Promise<string | undefined> {
-    if (!condaPath) {
-        traceVerbose('No conda path provided, cannot find local activation script');
-        return undefined;
-    }
-
     // Define all possible paths to check
     const paths = [
         // Direct path
@@ -351,7 +337,6 @@ export async function getLocalActivationScript(condaPath: string): Promise<strin
             traceVerbose(`Found local activation script in cache at: ${sourcingScript}`);
             return sourcingScript;
         }
-        traceVerbose(`Checking for local activation script at: ${sourcingScript}`);
         try {
             const exists = await fse.pathExists(sourcingScript);
             if (exists) {
diff --git a/src/managers/conda/condaUtils.ts b/src/managers/conda/condaUtils.ts
@@ -28,7 +28,7 @@ import {
 import { ENVS_EXTENSION_ID, EXTENSION_ROOT_DIR } from '../../common/constants';
 import { showErrorMessageWithLogs } from '../../common/errors/utils';
 import { Common, CondaStrings, PackageManagement, Pickers } from '../../common/localize';
-import { traceError, traceInfo, traceVerbose } from '../../common/logging';
+import { traceInfo, traceVerbose } from '../../common/logging';
 import { getWorkspacePersistentState } from '../../common/persistentState';
 import { pickProject } from '../../common/pickers/projects';
 import { createDeferred } from '../../common/utils/deferred';
@@ -415,17 +415,12 @@ async function generateShellActivationMap2(
         };
 
         if (!(envManager instanceof CondaEnvManager) || !envManager.sourcingInformation) {
-            logs.push('⚠️ Error: Conda environment manager is not available, using default conda activation paths');
+            logs.push('Error: Conda environment manager is not available, using default conda activation paths');
             shellMaps = await generateShellActivationMapFromConfig([condaCommonActivate], [condaCommonDeactivate]);
             return shellMaps;
         }
 
-        const { isActiveOnLaunch, globalSourcingScript, shellSourcingScripts } = envManager.sourcingInformation;
-        logs.push(`Sourcing Information:
-    - Active on Launch: ${isActiveOnLaunch}
-    - Global Script: ${globalSourcingScript ?? 'none'}
-    - Shell Scripts: ${shellSourcingScripts?.join(', ') ?? 'none'}
-`);
+        const { isActiveOnLaunch, globalSourcingScript } = envManager.sourcingInformation;
 
         // P1: first check to see if conda is already active in the whole VS Code workspace via sourcing info (set at startup)
         if (isActiveOnLaunch) {
@@ -439,9 +434,7 @@ async function generateShellActivationMap2(
         try {
             localSourcingPath = await getLocalActivationScript(prefix);
         } catch (err) {
-            logs.push(
-                `⚠️ Error getting local activation script: ${err instanceof Error ? err.message : 'Unknown error'}`,
-            );
+            logs.push(`Error getting local activation script: ${err instanceof Error ? err.message : 'Unknown error'}`);
         }
 
         logs.push(`Local Activation:
@@ -458,7 +451,7 @@ async function generateShellActivationMap2(
 
         // P2: Return shell activation if we have no sourcing
         if (!preferredSourcingPath) {
-            logs.push('⚠️ No sourcing path found, using default conda activation');
+            logs.push('No sourcing path found, using default conda activation');
             shellMaps = await generateShellActivationMapFromConfig([condaCommonActivate], [condaCommonDeactivate]);
             return shellMaps;
         }
@@ -483,9 +476,8 @@ async function generateShellActivationMap2(
         return shellMaps;
     } catch (error) {
         logs.push(
-            `❌ Error in shell activation map generation: ${error instanceof Error ? error.message : 'Unknown error'}`,
+            `Error in shell activation map generation: ${error instanceof Error ? error.message : 'Unknown error'}`,
         );
-        traceError('Failed to generate shell activation map. Falling back to default conda activation');
         // Fall back to default conda activation in case of error
         shellMaps = await generateShellActivationMapFromConfig(
             [{ executable: 'conda', args: ['activate', name || prefix] }],
@@ -542,12 +534,6 @@ async function windowsExceptionGenerateConfig(
     const shellActivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
     const shellDeactivation: Map<string, PythonCommandRunConfiguration[]> = new Map();
 
-    // set the NOT gitbash and bash to be
-    /// sourceInitPath conda activate ENVNAME
-    // localActivationPath conda activate prefix
-    // source pathInit ENVNAME for all NON bash
-
-    // not bash activate
     const ps1Hook = await getCondaHookPs1Path(condaFolder);
     traceVerbose(`PS1 hook path: ${ps1Hook ?? 'not found'}`);
     const activation = ps1Hook ? ps1Hook : sourceInitPath;
@@ -556,7 +542,6 @@ async function windowsExceptionGenerateConfig(
     const cmdActivate = [{ executable: sourceInitPath }, { executable: 'conda', args: ['activate', prefix] }];
 
     const bashActivate = [{ executable: 'source', args: [sourceInitPath.replace(/\\/g, '/'), prefix] }];
-    // TODO: for bashActivate the sep is \ but needs to be / ??? tried on gitbash
     traceVerbose(
         `Windows activation commands: 
         PowerShell: ${JSON.stringify(pwshActivate)}, 
diff --git a/src/managers/conda/main.ts b/src/managers/conda/main.ts
@@ -19,7 +19,7 @@ export async function registerCondaFeatures(
         // get Conda will return only ONE conda manager, that correlates to a single conda install
         const condaPath: string = await getConda(nativeFinder);
         const sourcingStatus: CondaSourcingStatus = await constructCondaSourcingStatus(condaPath);
-        traceInfo('Conda Sourcing Status:', sourcingStatus.toString());
+        traceInfo(sourcingStatus.toString());
 
         const envManager = new CondaEnvManager(nativeFinder, api, log);
         const packageManager = new CondaPackageManager(api, log);
