From 7a4de92b8e0db9ff73228b3653ed51485d0b7fcf Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Mon, 13 Nov 2023 13:45:47 -0800
Subject: [PATCH] Use `WorkspaceFolder.name` in addition to workspace folder's
 basename when resolving `${workspaceFolder:name}` syntax in settings (#22471)

Closes https://github.com/microsoft/vscode-python/issues/22452
---
 src/client/common/variables/systemVariables.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/client/common/variables/systemVariables.ts b/src/client/common/variables/systemVariables.ts
index eb318b2f4915..05e5d9d6f584 100644
--- a/src/client/common/variables/systemVariables.ts
+++ b/src/client/common/variables/systemVariables.ts
@@ -132,6 +132,8 @@ export class SystemVariables extends AbstractSystemVariables {
                 const basename = Path.basename(folder.uri.fsPath);
                 ((this as any) as Record<string, string | undefined>)[`workspaceFolder:${basename}`] =
                     folder.uri.fsPath;
+                ((this as any) as Record<string, string | undefined>)[`workspaceFolder:${folder.name}`] =
+                    folder.uri.fsPath;
             });
         } catch {
             // This try...catch block is here to support pre-existing tests, ignore error.