From c97945571e24c14bae9d885b359deec1385dff0e Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Thu, 17 Aug 2023 15:47:03 -0700
Subject: [PATCH] Set workspaceFolder in debug config before substituting
 command variables (#21835)

For https://github.com/microsoft/vscode-python/issues/18482
---
 .../debugger/extension/configuration/resolvers/launch.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/debugger/extension/configuration/resolvers/launch.ts b/src/client/debugger/extension/configuration/resolvers/launch.ts
index f48b2c19aaff..e4828844a7ad 100644
--- a/src/client/debugger/extension/configuration/resolvers/launch.ts
+++ b/src/client/debugger/extension/configuration/resolvers/launch.ts
@@ -55,6 +55,10 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
         }
 
         const workspaceFolder = LaunchConfigurationResolver.getWorkspaceFolder(folder);
+        // Pass workspace folder so we can get this when we get debug events firing.
+        // Do it here itself instead of `resolveDebugConfigurationWithSubstitutedVariables` which is called after
+        // this method, as in order to calculate substituted variables, this might be needed.
+        debugConfiguration.workspaceFolder = workspaceFolder?.fsPath;
         await this.resolveAndUpdatePaths(workspaceFolder, debugConfiguration);
         if (debugConfiguration.clientOS === undefined) {
             debugConfiguration.clientOS = getOSType() === OSType.Windows ? 'windows' : 'unix';
@@ -135,8 +139,6 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
             // Populate justMyCode using debugStdLib
             debugConfiguration.justMyCode = !debugConfiguration.debugStdLib;
         }
-        // Pass workspace folder so we can get this when we get debug events firing.
-        debugConfiguration.workspaceFolder = workspaceFolder ? workspaceFolder.fsPath : undefined;
         const debugOptions = debugConfiguration.debugOptions!;
         if (!debugConfiguration.justMyCode) {
             LaunchConfigurationResolver.debugOption(debugOptions, DebugOptions.DebugStdLib);