From 624c484e0978953253ae9966d964b74467d81479 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Mon, 28 Aug 2023 16:31:25 -0700
Subject: [PATCH 1/2] Activate environment when not using integrated terminal
 for debugging

---
 .../debugger/extension/configuration/resolvers/launch.ts  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/client/debugger/extension/configuration/resolvers/launch.ts b/src/client/debugger/extension/configuration/resolvers/launch.ts
index e4828844a7ad..04b98689ef58 100644
--- a/src/client/debugger/extension/configuration/resolvers/launch.ts
+++ b/src/client/debugger/extension/configuration/resolvers/launch.ts
@@ -19,7 +19,7 @@ import { getProgram, IDebugEnvironmentVariablesService } from './helper';
 
 @injectable()
 export class LaunchConfigurationResolver extends BaseConfigurationResolver<LaunchRequestArguments> {
-    private isPythonSet = false;
+    private isCustomPythonSet = false;
 
     constructor(
         @inject(IDiagnosticsService)
@@ -38,7 +38,7 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         debugConfiguration: LaunchRequestArguments,
         _token?: CancellationToken,
     ): Promise<LaunchRequestArguments | undefined> {
-        this.isPythonSet = debugConfiguration.python !== undefined;
+        this.isCustomPythonSet = debugConfiguration.python !== undefined;
         if (
             debugConfiguration.name === undefined &&
             debugConfiguration.type === undefined &&
@@ -110,7 +110,9 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
             debugConfiguration.envFile = settings.envFile;
         }
         let baseEnvVars: EnvironmentVariables | undefined;
-        if (this.isPythonSet) {
+        if (this.isCustomPythonSet || debugConfiguration.console !== 'integratedTerminal') {
+            // We only have an activated environment present in integrated terminal if no custom Python path is
+            // specified. Otherwise, we need to explicitly set the variables.
             baseEnvVars = await this.environmentActivationService.getActivatedEnvironmentVariables(
                 workspaceFolder,
                 await this.interpreterService.getInterpreterDetails(debugConfiguration.python ?? ''),

From bbedf22a1fcfba0aa48450639a1021c0a2e1dc8c Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Mon, 28 Aug 2023 16:34:13 -0700
Subject: [PATCH 2/2] Amend

---
 .../debugger/extension/configuration/resolvers/launch.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/debugger/extension/configuration/resolvers/launch.ts b/src/client/debugger/extension/configuration/resolvers/launch.ts
index 04b98689ef58..c4ae6a204d71 100644
--- a/src/client/debugger/extension/configuration/resolvers/launch.ts
+++ b/src/client/debugger/extension/configuration/resolvers/launch.ts
@@ -111,8 +111,8 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         }
         let baseEnvVars: EnvironmentVariables | undefined;
         if (this.isCustomPythonSet || debugConfiguration.console !== 'integratedTerminal') {
-            // We only have an activated environment present in integrated terminal if no custom Python path is
-            // specified. Otherwise, we need to explicitly set the variables.
+            // We only have the right activated environment present in integrated terminal if no custom Python path
+            // is specified. Otherwise, we need to explicitly set the variables.
             baseEnvVars = await this.environmentActivationService.getActivatedEnvironmentVariables(
                 workspaceFolder,
                 await this.interpreterService.getInterpreterDetails(debugConfiguration.python ?? ''),