Skip to content

Fix issue that logical location resolver would accidentally fail on recursive calls - #2928

Merged
DavyLandman merged 1 commit into
mainfrom
fix-logical-location-resolver
Oct 12, 2026
Merged

DavyLandman merged 1 commit into
mainfrom
fix-logical-location-resolver

Conversation

@sungshik

@sungshik sungshik commented Oct 12, 2026 •

Copy link
Copy Markdown
Contributor

This PR fixes an issue with the logical location resolver, which causes usethesource/rascal-language-servers#1229 to fail in GHA (update to RC17).

The problem is a regression bug introduced in #2901. Before #2901, the following could happen to resolve a logical location:

  1. Try a local resolver
  2. Try a remote resolver on the resolved location
  3. Return the last resolved location. That is, only if both step 1 and step 2 succeeded, then the result of step 2 was returned. But, if step 1 succeeded, but step 2 failed (returned null), then the result of step 1 was returned.

After #2901, however, the following would happen in the same scenario:

  1. Same as before
  2. Same as before
  3. Always return the result of step 2 (possibly null, even if step 1 succeeded).

This PR restores the version of step 3 from before #2901.

@sungshik
sungshik force-pushed the fix-logical-location-resolver branch from 7eb6d6b to 65a160c Compare October 12, 2026 09:46
@sonarqubecloud

Copy link
Copy Markdown

@codecov

codecov Bot commented Oct 12, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 30.00000% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 45%. Comparing base (922fc34) to head (65a160c).

Files with missing lines Patch % Lines
src/org/rascalmpl/uri/URIResolverRegistry.java 30% 6 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##              main   #2928   +/-   ##
=======================================
- Coverage       45%     45%   -1%     
+ Complexity    6815    6808    -7     
=======================================
  Files          844     844           
  Lines        68837   68842    +5     
  Branches     10039   10041    +2     
=======================================
- Hits         31435   31423   -12     
- Misses       35007   35026   +19     
+ Partials      2395    2393    -2     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sungshik
sungshik marked this pull request as ready for review October 12, 2026 10:21
@DavyLandman
DavyLandman merged commit 7108571 into main Oct 12, 2026
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants