rule_order: fold conditional blocks that share a condition - #211
Merged
Conversation
samoht
force-pushed
the
diff-report-shaping
branch
from
July 29, 2026 04:46
1e1ac4f to
3a7464e
Compare
It was a 37-line closure nested inside canonicalize_block that captured nothing from it, which pushed its host well past the length merlint accepts and hid a self-contained rewrite inside an unrelated function.
The projection coalesced repeated style rules but skipped conditional blocks, so two sheets that split the same @media content differently never converged and the comparator fell back to reporting the block structure positionally, as a merge plus a phantom rule entry per renumbered block. Blocks already stand in the conflict graph for the union of their interior selectors and declarations, so the existing interval test gates the fold without a new safety argument.
samoht
force-pushed
the
rule-order-block-fold
branch
from
July 29, 2026 04:47
b952f1a to
f5e2160
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The canonical projection coalesced repeated style rules but skipped conditional blocks, so two sheets that split the same
@mediacontent differently never converged and--diff=canonicalfell back to reporting the block structure positionally: a merge plus a phantom rule entry for every renumbered block. Blocks already stand in the conflict graph for the union of their interior selectors and declarations, so the existing interval test gates the fold without needing a new safety argument.Stacked on #210; review that one first. 87ca542 lifts
drop_shadowed_declarationsout ofcanonicalize_blockbeforehand, which is pure code motion.