From 776920f77d039cb64bde83492f19dc56cf9f2c69 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 6 May 2021 12:15:59 +0300 Subject: [PATCH] Cleanup code in FirAnnotationArgumentChecker --- .../expression/FirAnnotationArgumentChecker.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt index 0bd9ea62ac2..30064b4ffeb 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt @@ -18,13 +18,12 @@ import org.jetbrains.kotlin.psi.KtExpression object FirAnnotationArgumentChecker : FirAnnotationCallChecker() { override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) { - expression.argumentMapping?.let { - for ((arg, _) in it) { - val argExpression = (arg as? FirNamedArgumentExpression)?.expression ?: arg + val argumentMapping = expression.argumentMapping ?: return + for ((arg, _) in argumentMapping) { + val argExpression = (arg as? FirNamedArgumentExpression)?.expression ?: arg - checkAnnotationArgumentWithSubElements(argExpression, context.session, reporter, context) - ?.let { reporter.reportOn(argExpression.source, it, context) } - } + checkAnnotationArgumentWithSubElements(argExpression, context.session, reporter, context) + ?.let { reporter.reportOn(argExpression.source, it, context) } } }