Checkers: drop use-site targets handling from repeated annotation checks (KT-85288)#6179
Open
Mikhail Glukhikh (mglukhikh) wants to merge 5 commits into
Open
Checkers: drop use-site targets handling from repeated annotation checks (KT-85288)#6179Mikhail Glukhikh (mglukhikh) wants to merge 5 commits into
Mikhail Glukhikh (mglukhikh) wants to merge 5 commits into
Conversation
Code Owners
|
Mikhail Glukhikh (mglukhikh)
force-pushed
the
rr/mg/kt85288
branch
from
35edbcc to
dad8fb1
Compare
Mikhail Glukhikh (mglukhikh)
requested a review
from Kirill Rakhman (cypressious)
| for (annotation in annotations) { | ||
| val useSiteTarget = annotation.useSiteTarget ?: expression.getDefaultUseSiteTarget(annotation) | ||
| val existingTargetsForAnnotation = annotationsMap.getOrPut(annotation.annotationTypeRef.coneType) { arrayListOf() } | ||
| val coneType = annotation.annotationTypeRef.coneType |
Contributor
There was a problem hiding this comment.
Do we need to expand typealiases here? If yes, it might be a breaking change.
Contributor
Author
There was a problem hiding this comment.
Probably no, as the test below works, and it seems to me that we normally expand expression types beforehand. I will add the test to this MR to be more sure about correctness here.
@Target(AnnotationTarget.EXPRESSION)
@Retention(AnnotationRetention.SOURCE)
annotation class A
typealias B = A
fun main() {
val x = @A @B 1 // This annotation is not repeatable
}
Contributor
There was a problem hiding this comment.
JiC, the behavior might differ between regular tests and FirLightTreeDiagnosticsWithoutAliasExpansionTestGenerated.
Contributor
There was a problem hiding this comment.
Yep, it's failing.
| } | ||
|
|
||
| checkDeclaredRepeatedAnnotations(declaration) | ||
| val annotations = declaration.annotations.filterNot { it in annotationsWithIncorrectTarget } |
Contributor
There was a problem hiding this comment.
Suggested change
| val annotations = declaration.annotations.filterNot { it in annotationsWithIncorrectTarget } | |
| val annotations = declaration.annotations - annotationsWithIncorrectTarget |
Contributor
Author
There was a problem hiding this comment.
Applied manually
| if (annotation.source?.kind == KtFakeSourceElementKind.FromUseSiteTarget) return | ||
| ): Boolean { | ||
| if (annotation.source?.kind == KtFakeSourceElementKind.FromUseSiteTarget) return false | ||
| when (target) { |
Contributor
There was a problem hiding this comment.
Can this be refactored to return when? Some branches look like they could be split into multiple ones with guards to make the change easier.
Contributor
Author
There was a problem hiding this comment.
I will refactor it (not sure it becomes much better).
Before this commit, we handled each pair (annotation, use-site target) separately during repeating checks. In fact, it's not needed, as annotations are moved to different declarations during earlier checks, so we dropped unnecessary complexity in this commit. #KT-85288 Fixed
Before this commit, we checked all existing annotations on repetition, including erroneous ones, forcing sometimes questionable reporting of REPEATED_ANNOTATION and particular corner-case checks. In this commit, we filter out all annotations with incorrect target before repetition checks, thus allowing to drop corner cases and having less questionable diagnostics. Related to KT-85288
Mikhail Glukhikh (mglukhikh)
force-pushed
the
rr/mg/kt85288
branch
from
dad8fb1 to
3feaa12
Compare
Mikhail Glukhikh (mglukhikh)
requested a review
from Kirill Rakhman (cypressious)
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
2 participants
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.
No description provided.