Skip to content

Reapply "Merge branch 'main' into fix/logicallocs-in-compiler" - #2863

Merged
DavyLandman merged 2 commits into
mainfrom
chore/fix-merge-revert
Aug 19, 2026
Merged

Reapply "Merge branch 'main' into fix/logicallocs-in-compiler"#2863
DavyLandman merged 2 commits into
mainfrom
chore/fix-merge-revert

Conversation

@toinehartman

@toinehartman toinehartman commented Aug 19, 2026

Copy link
Copy Markdown
Member

This reverts commit 3d5369b, which in turn was a revert of a22f3e1 - a merge of main into #2797. The initial revert was done in an attempt to hunt down a failing test, but it reverted a number of bugfixes as well. These changes were unintentionally merged with #2797.

This PR fixes that. Note that this PR exactly mirrors the changes of the original merge a22f3e1, with two exceptions:

  1. Newer release versions in the POM, since they were updated on main after Gradually adapting compiler to logical locations #2797 was merged.
  2. Additions to the .git-blame-ignore-revs, to hide these extra revert commits in file histories, so changes can be related to their original PR. This PR should not be squashed for this to work!

This PR effectively re-applies the changes made on main after f71e749 and up until 4ce5e83:

@toinehartman
toinehartman marked this pull request as draft August 19, 2026 09:40
@sonarqubecloud

Copy link
Copy Markdown

@codecov

codecov Bot commented Aug 19, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 37.50000% with 20 lines in your changes missing coverage. Please review.
✅ Project coverage is 46%. Comparing base (77513bd) to head (654eeb3).

Files with missing lines Patch % Lines
...calmpl/uri/unsupported/UnsupportedURIResolver.java 29% 17 Missing ⚠️
src/org/rascalmpl/library/util/Reflective.java 0% 2 Missing ⚠️
src/org/rascalmpl/uri/URIResolverRegistry.java 50% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##              main   #2863   +/-   ##
=======================================
- Coverage       46%     46%   -1%     
- Complexity    6765    6770    +5     
=======================================
  Files          841     844    +3     
  Lines        67066   67096   +30     
  Branches     10021   10021           
=======================================
+ Hits         30882   30888    +6     
- Misses       33806   33836   +30     
+ Partials      2378    2372    -6     

☔ 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.

@toinehartman
toinehartman marked this pull request as ready for review August 19, 2026 10:31
@DavyLandman
DavyLandman merged commit 805dc0d into main Aug 19, 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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants