fixed issue in std:// resolver in the case where we are applying it w…

…hile testing from rascal/target/classes instead of from a jar file. now the tests can succeed as well
usethesource · Sep 16, 2024 · ac8080f · ac8080f
1 parent 5ea2006
commit ac8080f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/org/rascalmpl/library/util/PathConfig.java b/src/org/rascalmpl/library/util/PathConfig.java
@@ -354,14 +354,15 @@ public static ISourceLocation resolveDependencyFromResourcesOnCurrentClasspath(S
                         // parser to make sense of it and then convert it to an ISourceLocation
                         loc = vf.sourceLocation("file", null, URIUtil.fromURL(new URL(url.getPath())).getPath());
 
+                          // unjarify the path
+                          loc = URIUtil.changePath(loc, loc.getPath().replace("!/" + RascalManifest.META_INF_RASCAL_MF, ""));
                     }
                     else {
                         // this is typically a target folder
                         loc = vf.sourceLocation(URIUtil.fromURL(url));
+                        loc = URIUtil.getParentLocation(URIUtil.getParentLocation(loc));
                     }
 
-                    // unjarify the path
-                    loc = URIUtil.changePath(loc, loc.getPath().replace("!/" + RascalManifest.META_INF_RASCAL_MF, ""));
 
                     return loc;
                 }

diff --git a/src/org/rascalmpl/uri/StandardLibraryURIResolver.java b/src/org/rascalmpl/uri/StandardLibraryURIResolver.java
@@ -37,7 +37,7 @@ private static ISourceLocation resolveCurrentRascalJar() {
             return PathConfig.resolveCurrentRascalRuntimeJar(); 
         }
         catch (IOException e) {
-            // this will be reported elsewhere in PathConfi - 
+            // this will be reported elsewhere in PathConfig.messages - 
             return null;
         }
     }