Fix type-use annotation duplication on nested classes and arrays - #2115
Merged
Conversation
copybara-service
Bot
force-pushed
the
test_960390407
branch
from
August 11, 2026 21:51
abcf51e to
1858d35
Compare
Type-use annotations placed at the beginning of a return type (e.g. `@Nullable Enclosing.Inner` or `@Nullable byte[]`) are associated with the left-most type—the enclosing class type and array component type, respectively. AutoValue's getReturnTypeAnnotations previously only checked annotations on the root return type (e.g. `Inner` or `byte[]`), failing to check annotations on the left-most type as return type. As a result, it treated them as method declaration annotations and duplicated them onto the generated method. This fix updates getReturnTypeAnnotations to inspect the left-most type (unwrapping enclosing declared types and array component types) so type annotations are correctly excluded from being copied to method declarations. RELNOTES=n/a PiperOrigin-RevId: 963017165
copybara-service
Bot
force-pushed
the
test_960390407
branch
from
August 11, 2026 21:56
1858d35 to
9d4c23a
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.
Fix type-use annotation duplication on nested classes and arrays
Type-use annotations placed at the beginning of a return type (e.g.
@Nullable Enclosing.Inneror@Nullable byte[]) are associated with the left-mosttype—the enclosing class type and array component type, respectively.
AutoValue's getReturnTypeAnnotations previously only checked annotations on the
root return type (e.g.
Innerorbyte[]), failing to check annotations onthe left-most type as return type. As a result, it treated them as method
declaration annotations and duplicated them onto the generated method.
This fix updates getReturnTypeAnnotations to inspect the left-most type
(unwrapping enclosing declared types and array component types) so type
annotations are correctly excluded from being copied to method declarations.
RELNOTES=n/a