From 8d6d43c33b0d4b757addafae12739e60e785e53f Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Mon, 7 Sep 2020 16:18:45 +0000
Subject: [PATCH] 8251193: bin/idea.sh is generating wrong folder definitions
 for JVMCI modules

Co-authored-by: Galder Zamarreno <galder@redhat.com>
Reviewed-by: mcimadamore
---
 bin/idea.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bin/idea.sh b/bin/idea.sh
index 35162ce943c..49c6ee45e3b 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -184,7 +184,18 @@ for root in $MODULE_ROOTS; do
     elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
       root=`wslpath -am $root`
     fi
-    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+
+    VM_CI="jdk.internal.vm.ci/share/classes"
+    VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
+    if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
+        for subdir in "$root"/*; do
+            if [ -d "$subdir" ]; then
+                SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
+            fi
+        done
+    else
+        SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+    fi
 done
 
 add_replacement "###SOURCE_ROOTS###" "$SOURCES"