Accounted for another edge case around the fallback resolver. Thanks @…

…DavyLandman
usethesource · Dec 16, 2024 · aea1af5 · aea1af5
1 parent 65e6400
commit aea1af5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/org/rascalmpl/uri/URIResolverRegistry.java b/src/org/rascalmpl/uri/URIResolverRegistry.java
@@ -402,9 +402,11 @@ private ISourceLocation physicalLocation(ISourceLocation loc) throws IOException
 			ILogicalSourceLocationResolver resolver = map.get(auth);
 			loc = resolveAndFixOffsets(loc, resolver, map.values());
 		}
-		var fallBack = fallbackLogicalResolver;
-		if (fallBack != null) {
-			var fallbackResult = resolveAndFixOffsets(loc == null ? original : loc, fallBack, Collections.emptyList());
+		if (loc == null) {
+			loc = original;
+		}
+		if (fallbackLogicalResolver != null) {
+			var fallbackResult = resolveAndFixOffsets(loc == null ? original : loc, fallbackLogicalResolver, Collections.emptyList());
 			return fallbackResult == null ? loc : fallbackResult;
 		}
 		return loc;