Improved handling of an edge case around the fallback resolver.

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