From 9542e919a4b29c6ffff683c3991e3e498fdfd34a Mon Sep 17 00:00:00 2001
From: Jendrik Johannes <jendrik.johannes@gmail.com>
Date: Wed, 16 Oct 2024 08:20:28 +0200
Subject: [PATCH] fix - Add root project folder to each key in
 projectTreeItemMap (#1617)

In #1612, the keys of this map were changed to the Gradle project path.
This path is unique for each project within one Gradle build, but not
if there are multiple Gradle builds loaded in one workspace by using:
'gradle.nestedProjects': true

This change combined the old and new behavior by creating the Map key
from two parts:
(1) The root project folder which uniquely identifies the build
    (accessible via definition.projectFolder)
(2) The Gradle project path that uniquely identifies a project inside
    the build

Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
---
 .../src/views/gradleTasks/GradleTasksTreeDataProvider.ts   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extension/src/views/gradleTasks/GradleTasksTreeDataProvider.ts b/extension/src/views/gradleTasks/GradleTasksTreeDataProvider.ts
index b6c7f4713..d7c4007b7 100644
--- a/extension/src/views/gradleTasks/GradleTasksTreeDataProvider.ts
+++ b/extension/src/views/gradleTasks/GradleTasksTreeDataProvider.ts
@@ -254,13 +254,14 @@ export class GradleTasksTreeDataProvider implements vscode.TreeDataProvider<vsco
                 }
 
                 const projectPath = definition.script.split(":").slice(0, -1);
-                let projectTreeItem = projectTreeItemMap.get(projectPath.join(":"));
+                const projectMapKey = definition.projectFolder + "_" + projectPath.join(":");
+                let projectTreeItem = projectTreeItemMap.get(projectMapKey);
                 if (!projectTreeItem) {
                     const parentProjectPath = projectPath.length == 0 ? null : projectPath.slice(0, -1);
                     const parentProject =
                         parentProjectPath === null
                             ? gradleProjectTreeItem
-                            : projectTreeItemMap.get(parentProjectPath.join(":"));
+                            : projectTreeItemMap.get(definition.projectFolder + "_" + parentProjectPath.join(":"));
                     projectTreeItem = new ProjectTreeItem(
                         definition.project,
                         parentProject,
@@ -271,7 +272,7 @@ export class GradleTasksTreeDataProvider implements vscode.TreeDataProvider<vsco
                     } else {
                         gradleProjectTreeItem.addProject(projectTreeItem);
                     }
-                    projectTreeItemMap.set(projectPath.join(":"), projectTreeItem);
+                    projectTreeItemMap.set(projectMapKey, projectTreeItem);
                 }
 
                 const taskName = definition.script.slice(definition.script.lastIndexOf(":") + 1);