continue

Author: Kartik Raj

src/client/interpreter/activation/service.ts

@@ -186,6 +186,7 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
         if (!shellInfo) {
             return;
         }
+        let isPossiblyCondaEnv = false;
         try {
             let command: string | undefined;
             let [args, parse] = internalScripts.printEnvVariables();
@@ -203,23 +204,9 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
                     command = [...pythonArgv, ...args].map((arg) => arg.toCommandArgumentForPythonExt()).join(' ');
                 }
             }
-            if (!command) {
-                const activationCommands = await this.helper.getEnvironmentActivationShellCommands(
-                    resource,
-                    shellInfo.shellType,
-                    interpreter,
-                );
-                traceVerbose(`Activation Commands received ${activationCommands} for shell ${shellInfo.shell}`);
-                if (!activationCommands || !Array.isArray(activationCommands) || activationCommands.length === 0) {
-                    return;
-                }
-                // Run the activate command collect the environment from it.
-                const activationCommand = this.fixActivationCommands(activationCommands).join(' && ');
-                // In order to make sure we know where the environment output is,
-                // put in a dummy echo we can look for
-                command = `${activationCommand} && echo '${ENVIRONMENT_PREFIX}' && python ${args.join(' ')}`;
-            }
-
+            isPossiblyCondaEnv = activationCommands.join(' ').toLowerCase().includes('conda');
+            // Run the activate command collect the environment from it.
+            const activationCommand = this.fixActivationCommands(activationCommands).join(' && ');
             const processService = await this.processServiceFactory.create(resource);
             const customEnvVars = await this.envVarsService.getEnvironmentVariables(resource);
             const hasCustomEnvVars = Object.keys(customEnvVars).length;
@@ -231,6 +218,14 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
             env[PYTHON_WARNINGS] = 'ignore';
 
             traceVerbose(`${hasCustomEnvVars ? 'Has' : 'No'} Custom Env Vars`);
+
+            // In order to make sure we know where the environment output is,
+            // put in a dummy echo we can look for
+            const [args, parse] = internalScripts.printEnvVariables();
+            args.forEach((arg, i) => {
+                args[i] = arg.toCommandArgumentForPythonExt();
+            });
+            const command = `${activationCommand} && echo '${ENVIRONMENT_PREFIX}' && python ${args.join(' ')}`;
             traceVerbose(`Activating Environment to capture Environment variables, ${command}`);
 
             // Do some wrapping of the call. For two reasons:
@@ -248,10 +243,7 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
                     result = await processService.shellExec(command, {
                         env,
                         shell: shellInfo.shell,
-                        timeout:
-                            interpreter?.envType === EnvironmentType.Conda
-                                ? CONDA_ENVIRONMENT_TIMEOUT
-                                : ENVIRONMENT_TIMEOUT,
+                        timeout: isPossiblyCondaEnv ? CONDA_ENVIRONMENT_TIMEOUT : ENVIRONMENT_TIMEOUT,
                         maxBuffer: 1000 * 1000,
                         throwOnStdErr: false,
                     });
@@ -297,7 +289,7 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
         } catch (e) {
             traceError('getActivatedEnvironmentVariables', e);
             sendTelemetryEvent(EventName.ACTIVATE_ENV_TO_GET_ENV_VARS_FAILED, undefined, {
-                isPossiblyCondaEnv: interpreter?.envType === EnvironmentType.Conda,
+                isPossiblyCondaEnv,
                 terminal: shellInfo.shellType,
             });
 
@@ -315,9 +307,6 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
     @traceDecoratorError('Failed to parse Environment variables')
     @traceDecoratorVerbose('parseEnvironmentOutput', TraceOptions.None)
     protected parseEnvironmentOutput(output: string, parse: (out: string) => NodeJS.ProcessEnv | undefined) {
-        if (output.indexOf(ENVIRONMENT_PREFIX) === -1) {
-            return parse(output);
-        }
         output = output.substring(output.indexOf(ENVIRONMENT_PREFIX) + ENVIRONMENT_PREFIX.length);
         const js = output.substring(output.indexOf('{')).trim();
         return parse(js);

src/test/interpreters/activation/service.unit.test.ts

@@ -58,7 +58,7 @@ suite('Interpreters Activation - Python Environment Variables', () => {
         architecture: Architecture.x64,
     };
 
-    function initSetup(interpreter: PythonEnvironment | undefined) {
+    function initSetup() {
         helper = mock(TerminalHelper);
         platform = mock(PlatformService);
         processServiceFactory = mock(ProcessServiceFactory);
@@ -71,7 +71,6 @@ suite('Interpreters Activation - Python Environment Variables', () => {
         onDidChangeInterpreter = new EventEmitter<void>();
         when(envVarsService.onDidEnvironmentVariablesChange).thenReturn(onDidChangeEnvVariables.event);
         when(interpreterService.onDidChangeInterpreter).thenReturn(onDidChangeInterpreter.event);
-        when(interpreterService.getActiveInterpreter(anything())).thenResolve(interpreter);
         service = new EnvironmentActivationService(
             instance(helper),
             instance(platform),
@@ -90,7 +89,7 @@ suite('Interpreters Activation - Python Environment Variables', () => {
     [undefined, Uri.parse('a')].forEach((resource) =>
         [undefined, pythonInterpreter].forEach((interpreter) => {
             suite(title(resource, interpreter), () => {
-                setup(() => initSetup(interpreter));
+                setup(initSetup);
                 test('Unknown os will return empty variables', async () => {
                     when(platform.osType).thenReturn(OSType.Unknown);
                     const env = await service.getActivatedEnvironmentVariables(resource);
@@ -103,7 +102,7 @@ suite('Interpreters Activation - Python Environment Variables', () => {
 
                 osTypes.forEach((osType) => {
                     suite(osType.name, () => {
-                        setup(() => initSetup(interpreter));
+                        setup(initSetup);
                         test('getEnvironmentActivationShellCommands will be invoked', async () => {
                             when(platform.osType).thenReturn(osType.value);
                             when(