Don't swallow @utility declarations when @apply is used in nested rules#16940
Merged
philipp-spiess merged 2 commits intomainfrom Mar 4, 2025
Merged
Conversation
6b2050e to
3291383
Compare
RobinMalfait
approved these changes
Mar 4, 2025
1 task
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
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.
Fixes #16935
This PR fixes an issue where the order of how
@applywas resolved was incorrect for nested rules. Consider this example:The way we topologically sort these, we end up with a list that looks roughly like this:
As you can see here the nested rule is now part of the top-level list. This is correct because we first have to substitute the
@applyinside the@utility custom-utilitybefore we can apply thecustom-utilityinside.nested-rule. However, because we were using a regular AST walk and because the initial.rulealso contains the.nested-ruleas child, we would first substitute the@applyinside the.nested-rule, causing the design-system to force resolve (and cache) the wrong value forcustom-utility.Because the list is already flattened, we do not need to recursively look into child declarations when we traverse the sorted list. This PR changes it to use a regular
forloop instead of thewalk.Test plan