More fixes to getModuleName

usethesource · Sep 26, 2024 · 0c2d864 · 0c2d864
1 parent 5e213b6
commit 0c2d864
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/org/rascalmpl/library/util/Reflective.rsc b/src/org/rascalmpl/library/util/Reflective.rsc
@@ -213,10 +213,13 @@ str getModuleName(loc moduleLoc,  PathConfig pcfg){
             while(candidate[0] == "/"){
                 candidate = candidate[1..];
             }
-            if(candidate[0] == "$"){
-                candidate = candidate[1..];
-            }
+
             candidateAsList = split("/", candidate);
+            lastName = candidateAsList[-1];
+            if(lastName[0] == "$"){
+                candidateAsList = [*candidateAsList[..-1],lastName[1..]];
+            }
+            //println("cand: <candidateAsList>, modpath: <modulePathAsList>");
             n = commonPrefix(reverse(candidateAsList), modulePathReversed);
 
             if(n > longestSuffix){