azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FirRepeatableAnnotationChecker: expand some annotation class ids

Browse Source 
Related to KT-55615
This commit is contained in:
Mikhail Glukhikh
2023-01-04 22:29:14 +01:00
committed by Space Team
parent 31a20a6631
commit ad29fb349f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt
+4 -4
View File
@@ -47,7 +47,7 @@ object FirRepeatableAnnotationChecker : FirBasicDeclarationChecker() {
val session = context.session
for (annotation in annotations) {
val classId = annotation.classId ?: continue
val unexpandedClassId = annotation.classId ?: continue
val annotationClassId = annotation.toAnnotationClassId(session) ?: continue
if (annotationClassId.isLocal) continue
val annotationClass = session.symbolProvider.getClassLikeSymbolByClassId(annotationClassId) ?: continue
@@ -69,11 +69,11 @@ object FirRepeatableAnnotationChecker : FirBasicDeclarationChecker() {
// on the same element.
// See https://docs.oracle.com/javase/specs/jls/se16/html/jls-9.html#jls-9.7.5.
val explicitContainer = annotationClass.resolveContainerAnnotation(session)
if (explicitContainer != null && annotations.any { it.classId == explicitContainer }) {
if (explicitContainer != null && annotations.any { it.toAnnotationClassId(session) == explicitContainer }) {
reporter.reportOn(
annotation.source,
FirJvmErrors.REPEATED_ANNOTATION_WITH_CONTAINER,
classId,
unexpandedClassId,
explicitContainer,
context
)
@@ -91,7 +91,7 @@ object FirRepeatableAnnotationChecker : FirBasicDeclarationChecker() {
if (javaRepeatable != null) {
checkJavaRepeatableAnnotationDeclaration(javaRepeatable, declaration, context, reporter)
} else {
val kotlinRepeatable = annotations.find { it.classId == StandardClassIds.Annotations.Repeatable }
val kotlinRepeatable = annotations.find { it.toAnnotationClassId(session) == StandardClassIds.Annotations.Repeatable }
if (kotlinRepeatable != null) {
checkKotlinRepeatableAnnotationDeclaration(kotlinRepeatable, declaration, context, reporter)
}