From a3d6bf39004e2ec0f902ebd0adcf4a5af0764798 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Tue, 13 Feb 2024 09:29:30 +0000 Subject: [PATCH 1/3] Do not activate microvenv if terminal.activateEnvironment is set to false --- src/client/terminals/envCollectionActivation/service.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/client/terminals/envCollectionActivation/service.ts b/src/client/terminals/envCollectionActivation/service.ts index 491ae786754b..f9e14cee751c 100644 --- a/src/client/terminals/envCollectionActivation/service.ts +++ b/src/client/terminals/envCollectionActivation/service.ts @@ -353,6 +353,11 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ private async handleMicroVenv(resource: Resource) { try { + const settings = this.configurationService.getSettings(resource); + if (!settings.terminal.activateEnvironment) { + traceVerbose('Activating environments in terminal is disabled for', resource?.fsPath); + return; + } const workspaceFolder = this.getWorkspaceFolder(resource); const interpreter = await this.interpreterService.getActiveInterpreter(resource); if (interpreter?.envType === EnvironmentType.Venv) { From 52f0977621471594a88f5c2c27deac46fe1e814d Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Tue, 13 Feb 2024 09:30:09 +0000 Subject: [PATCH 2/3] clear existing env --- src/client/terminals/envCollectionActivation/service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/terminals/envCollectionActivation/service.ts b/src/client/terminals/envCollectionActivation/service.ts index f9e14cee751c..c40101b5662d 100644 --- a/src/client/terminals/envCollectionActivation/service.ts +++ b/src/client/terminals/envCollectionActivation/service.ts @@ -354,11 +354,12 @@ 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('Activating environments in terminal is disabled for', resource?.fsPath); return; } - const workspaceFolder = this.getWorkspaceFolder(resource); const interpreter = await this.interpreterService.getActiveInterpreter(resource); if (interpreter?.envType === EnvironmentType.Venv) { const activatePath = path.join(path.dirname(interpreter.path), 'activate'); From 8140f10e08356aab513a8727ffb0a22de121b6d4 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Tue, 13 Feb 2024 09:30:32 +0000 Subject: [PATCH 3/3] log --- src/client/terminals/envCollectionActivation/service.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/terminals/envCollectionActivation/service.ts b/src/client/terminals/envCollectionActivation/service.ts index c40101b5662d..aaa4ccf23bea 100644 --- a/src/client/terminals/envCollectionActivation/service.ts +++ b/src/client/terminals/envCollectionActivation/service.ts @@ -357,7 +357,10 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ const workspaceFolder = this.getWorkspaceFolder(resource); if (!settings.terminal.activateEnvironment) { this.getEnvironmentVariableCollection({ workspaceFolder }).clear(); - traceVerbose('Activating environments in terminal is disabled for', resource?.fsPath); + traceVerbose( + 'Do not activate microvenv as activating environments in terminal is disabled for', + resource?.fsPath, + ); return; } const interpreter = await this.interpreterService.getActiveInterpreter(resource);