From ce262b0fb8dd5e2517daca772485660241f090a4 Mon Sep 17 00:00:00 2001
From: Egor Kulikov <egor.kulikov@jetbrains.com>
Date: Thu, 29 Dec 2022 14:19:31 +0100
Subject: [PATCH] [FIR] Make annotations arguments lazy in RawFirBuilder

Fix style and typo
---
 .../api/fir/lazy/resolve/FirLazyBodiesCalculator.kt  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
index 15e670a1a30..f0094963733 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt
@@ -218,7 +218,7 @@ private data class FirLazyAnnotationTransformerData(
 )
 
 private object FirLazyAnnotationTransformer : FirTransformer<FirLazyAnnotationTransformerData>() {
-    private val COMPILATOR_ANNOTATION_NAMES: Set<Name> = setOf(
+    private val COMPILER_ANNOTATION_NAMES: Set<Name> = setOf(
         Deprecated,
         DeprecatedSinceKotlin,
         WasExperimental,
@@ -231,7 +231,7 @@ private object FirLazyAnnotationTransformer : FirTransformer<FirLazyAnnotationTr
         if (annotationTypeRef !is FirUserTypeRef) return false
         if (session.registeredPluginAnnotations.annotations.isNotEmpty()) return true
         val name = annotationTypeRef.qualifier.last().name
-        return name in COMPILATOR_ANNOTATION_NAMES
+        return name in COMPILER_ANNOTATION_NAMES
     }
 
     override fun <E : FirElement> transformElement(element: E, data: FirLazyAnnotationTransformerData): E {
@@ -240,11 +240,9 @@ private object FirLazyAnnotationTransformer : FirTransformer<FirLazyAnnotationTr
     }
 
     override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: FirLazyAnnotationTransformerData): FirStatement {
-        if ((data.compilerAnnotationsOnly == FirLazyAnnotationTransformerScope.ALL_ANNOTATIONS || canBeCompilerAnnotation(
-                annotationCall,
-                data.session,
-            )) && FirLazyBodiesCalculator.needCalculatingAnnotationCall(annotationCall)
-        ) {
+        val shouldCalculate = data.compilerAnnotationsOnly == FirLazyAnnotationTransformerScope.ALL_ANNOTATIONS ||
+                canBeCompilerAnnotation(annotationCall, data.session)
+        if (shouldCalculate && FirLazyBodiesCalculator.needCalculatingAnnotationCall(annotationCall)) {
             FirLazyBodiesCalculator.calculateLazyArgumentsForAnnotation(annotationCall, data.session)
         }
         super.transformAnnotationCall(annotationCall, data)