use the resolved value of const arguments in propagated annotation arguments
#940
Conversation
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
14656bc to
53093dd
Compare
53093dd to
1d7207e
Compare
ZacSweers
approved these changes
Mar 28, 2024
…arguments We have a good deal of logic around parsing out the primitive values of `const` parameters, but that logic is not recursive. So, if a `const` references another `const` in its initializer, we wound up just copying the text of that initializer into the generated annotations, as though it's just a String. This problem was isolated to the PSI side of parsing, since the Descriptor APIs are able to parse out the final, primitive value. Our type resolution logic always defaults to the PSI models. Now, when we need to parse out the primitive values from a `PropertyReference`, we first try to resolve the Descriptor version with a `PropertyDescriptor`. That isn't possible if the annotation is referencing a `const` property that was generated in the same round of compilation. In that event, the parsing will fall back to the PSI models. Anvil doesn't actually generate a `const` and then use it in an annotation, so this seems like a reasonable compromise. fixes #938
1d7207e to
1741c56
Compare
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.
We have a good deal of logic around parsing out the primitive values of
constparameters, but that logic is not recursive. So, if aconstreferences anotherconstin its initializer, we wound up just copying the text of that initializer into the generated annotations, as though it's just a String. This problem was isolated to the PSI side of parsing, since the Descriptor APIs are able to parse out the final, primitive value. Our type resolution logic always defaults to the PSI models.Now, when we need to parse out the primitive values from a
PropertyReference, we first try to resolve the Descriptor version with aPropertyDescriptor. That isn't possible if the annotation is referencing aconstproperty that was generated in the same round of compilation. In that event, the parsing will fall back to the PSI models. Anvil doesn't actually generate aconstand then use it in an annotation, so this seems like a reasonable compromise.fixes #938