From f0145f45a17b39a3410486107c05f695a4191e87 Mon Sep 17 00:00:00 2001
From: katkerem <katkerem@amazon.com>
Date: Fri, 7 Nov 2025 10:49:45 +0000
Subject: [PATCH 1/2] 8371425: Include folder names in vscode workspace virtual
 folders

---
 make/ide/vscode/hotspot/CreateVSCodeProject.gmk  | 2 ++
 make/ide/vscode/hotspot/template-workspace.jsonc | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
index 11f25c152f62c..a07344c37517a 100644
--- a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
+++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
@@ -84,6 +84,8 @@ define CreateFromTemplate
 	$(SED) -e 's!{{TOPDIR}}!$(call SedEscape,$(call FixPath,$(TOPDIR)))!g' \
 	    -e 's!{{TOPDIR_RELATIVE}}!$(call SedEscape,$(call FixPath,$(strip \
 	        $(call RelativePath,$(OUTPUTDIR),$(TOPDIR)))))!g' \
+		-e 's!{{TOPDIR_BASE}}!$(notdir $(TOPDIR))!g' \
+		-e 's!{{OUTPUT_BASE}}!$(notdir $(OUTPUTDIR))!g' \
 	    -e 's!{{WORKSPACE_ROOT}}!$(call SedEscape,$(call FixPath,$(WORKSPACE_ROOT)))!g' \
 	    -e 's!{{OUTPUTDIR}}!$(call SedEscape,$(call FixPath,$(OUTPUTDIR)))!g' \
 	    -e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \
diff --git a/make/ide/vscode/hotspot/template-workspace.jsonc b/make/ide/vscode/hotspot/template-workspace.jsonc
index 8a349b232ce2b..271b079f55326 100644
--- a/make/ide/vscode/hotspot/template-workspace.jsonc
+++ b/make/ide/vscode/hotspot/template-workspace.jsonc
@@ -1,12 +1,12 @@
 {
 	"folders": [
 		{
-			"name": "Source root",
+			"name": "Source root ({{TOPDIR_BASE}})",
 			"path": "{{TOPDIR}}"
 		},
 		// {{EXTRA_WORKSPACE_ROOT}}
 		{
-			"name": "Build artifacts",
+			"name": "Build artifacts ({{OUTPUT_BASE}})",
 			"path": "{{OUTPUTDIR}}"
 		}
 	],

From 9f39f939e45a33e1f575e046e551e4060bdde109 Mon Sep 17 00:00:00 2001
From: katkerem <katkerem@amazon.com>
Date: Fri, 7 Nov 2025 14:01:18 +0000
Subject: [PATCH 2/2] fix space

---
 make/ide/vscode/hotspot/CreateVSCodeProject.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
index a07344c37517a..9e5671b8250e6 100644
--- a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
+++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
@@ -84,8 +84,8 @@ define CreateFromTemplate
 	$(SED) -e 's!{{TOPDIR}}!$(call SedEscape,$(call FixPath,$(TOPDIR)))!g' \
 	    -e 's!{{TOPDIR_RELATIVE}}!$(call SedEscape,$(call FixPath,$(strip \
 	        $(call RelativePath,$(OUTPUTDIR),$(TOPDIR)))))!g' \
-		-e 's!{{TOPDIR_BASE}}!$(notdir $(TOPDIR))!g' \
-		-e 's!{{OUTPUT_BASE}}!$(notdir $(OUTPUTDIR))!g' \
+	    -e 's!{{TOPDIR_BASE}}!$(notdir $(TOPDIR))!g' \
+	    -e 's!{{OUTPUT_BASE}}!$(notdir $(OUTPUTDIR))!g' \
 	    -e 's!{{WORKSPACE_ROOT}}!$(call SedEscape,$(call FixPath,$(WORKSPACE_ROOT)))!g' \
 	    -e 's!{{OUTPUTDIR}}!$(call SedEscape,$(call FixPath,$(OUTPUTDIR)))!g' \
 	    -e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \