Do not activate microvenv if terminal.activateEnvironment is set to f…

…alse and when not in terminal experiment (#22909)
microsoft · Feb 13, 2024 · 6838ccf · 6838ccf
1 parent 2dc158e
commit 6838ccf
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/client/terminals/envCollectionActivation/service.ts b/src/client/terminals/envCollectionActivation/service.ts
@@ -353,7 +353,16 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
 
     private async handleMicroVenv(resource: Resource) {
         try {
+            const settings = this.configurationService.getSettings(resource);
             const workspaceFolder = this.getWorkspaceFolder(resource);
+            if (!settings.terminal.activateEnvironment) {
+                this.getEnvironmentVariableCollection({ workspaceFolder }).clear();
+                traceVerbose(
+                    'Do not activate microvenv as activating environments in terminal is disabled for',
+                    resource?.fsPath,
+                );
+                return;
+            }
             const interpreter = await this.interpreterService.getActiveInterpreter(resource);
             if (interpreter?.envType === EnvironmentType.Venv) {
                 const activatePath = path.join(path.dirname(interpreter.path), 'activate');