From a7f260e2b5b9ec5cc72700b78504107868c42ac1 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Mon, 28 Aug 2023 15:48:15 -0700
Subject: [PATCH] Apply custom env variables to terminal when in
 `pythonTerminalEnvVarActivation` experiment

---
 src/client/common/process/processFactory.ts  | 6 ++++--
 src/client/common/process/types.ts           | 2 +-
 src/client/interpreter/activation/service.ts | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client/common/process/processFactory.ts b/src/client/common/process/processFactory.ts
index 8681d5073d8e..40204a640dae 100644
--- a/src/client/common/process/processFactory.ts
+++ b/src/client/common/process/processFactory.ts
@@ -17,8 +17,10 @@ export class ProcessServiceFactory implements IProcessServiceFactory {
         @inject(IProcessLogger) private readonly processLogger: IProcessLogger,
         @inject(IDisposableRegistry) private readonly disposableRegistry: IDisposableRegistry,
     ) {}
-    public async create(resource?: Uri): Promise<IProcessService> {
-        const customEnvVars = await this.envVarsService.getEnvironmentVariables(resource);
+    public async create(resource?: Uri, options?: { doNotUseCustomEnvs: boolean }): Promise<IProcessService> {
+        const customEnvVars = options?.doNotUseCustomEnvs
+            ? undefined
+            : await this.envVarsService.getEnvironmentVariables(resource);
         const proc: IProcessService = new ProcessService(customEnvVars);
         this.disposableRegistry.push(proc);
         return proc.on('exec', this.processLogger.logProcess.bind(this.processLogger));
diff --git a/src/client/common/process/types.ts b/src/client/common/process/types.ts
index 62e787b694b5..d4b742718e36 100644
--- a/src/client/common/process/types.ts
+++ b/src/client/common/process/types.ts
@@ -55,7 +55,7 @@ export interface IProcessService extends IDisposable {
 export const IProcessServiceFactory = Symbol('IProcessServiceFactory');
 
 export interface IProcessServiceFactory {
-    create(resource?: Uri): Promise<IProcessService>;
+    create(resource?: Uri, options?: { doNotUseCustomEnvs: boolean }): Promise<IProcessService>;
 }
 
 export const IPythonExecutionFactory = Symbol('IPythonExecutionFactory');
diff --git a/src/client/interpreter/activation/service.ts b/src/client/interpreter/activation/service.ts
index 4364cc825f78..02d621c0ccda 100644
--- a/src/client/interpreter/activation/service.ts
+++ b/src/client/interpreter/activation/service.ts
@@ -192,7 +192,7 @@ export class EnvironmentActivationService implements IEnvironmentActivationServi
                 args[i] = arg.toCommandArgumentForPythonExt();
             });
             const command = `${interpreterPath} ${args.join(' ')}`;
-            const processService = await this.processServiceFactory.create(resource);
+            const processService = await this.processServiceFactory.create(resource, { doNotUseCustomEnvs: true });
             const result = await processService.shellExec(command, {
                 shell,
                 timeout: ENVIRONMENT_TIMEOUT,