From 57dda3bf928b33feb807f4e4cb3a8468f602b8a9 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Fri, 13 Jan 2023 11:05:10 +0100 Subject: [PATCH] FIR: fix FirAnnotationChecker for FirProperty This change is necessary for testTypeAliasExpansionRepeatedAnnotations to work properly (otherwise we don't check a property at all). Before current changes, the test worked thanks to accessors analysis which is now OFF because of source kind check. --- .../analysis/checkers/declaration/FirAnnotationChecker.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt index 23f15d629a8..b0bea8175e1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt @@ -68,9 +68,11 @@ object FirAnnotationChecker : FirBasicDeclarationChecker() { checkRepeatedAnnotations(declaration, context, reporter) - if (declaration is FirProperty) { - checkRepeatedAnnotationsInProperty(declaration, context, reporter) - } else if (declaration is FirCallableDeclaration) { + if (declaration is FirCallableDeclaration) { + if (declaration is FirProperty) { + checkRepeatedAnnotationsInProperty(declaration, context, reporter) + } + if (declaration.source?.kind is KtRealSourceElementKind && declaration.returnTypeRef.source?.kind is KtRealSourceElementKind) { checkRepeatedAnnotations(declaration.returnTypeRef.coneTypeSafe(), context, reporter) }