diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsBox.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsBox.kt index 443fd3a9491..e4b2bfff8a6 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsBox.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsBox.kt @@ -12,7 +12,7 @@ import com.intellij.psi.PsiModifierList * This class is used as a proxy for [com.intellij.psi.PsiAnnotationOwner]. * * [LazyAnnotationsBox] provides an ability to compute each annotation separately and in a lazy way to avoid heavy computation. - * [SimpleAnnotationsBox] provides an ability to compute all annotations once on first access. + * [ComputeAllAtOnceAnnotationsBox] provides an ability to compute all annotations once on first access. * [EmptyAnnotationsBox] just a box without annotations. * * @see org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightModifierList diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAnnotationsBox.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/ComputeAllAtOnceAnnotationsBox.kt similarity index 86% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAnnotationsBox.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/ComputeAllAtOnceAnnotationsBox.kt index 177a3af597f..6a45a555f92 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAnnotationsBox.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/ComputeAllAtOnceAnnotationsBox.kt @@ -10,7 +10,9 @@ import com.intellij.psi.PsiModifierList import org.jetbrains.kotlin.light.classes.symbol.toArrayIfNotEmptyOrDefault import java.util.concurrent.atomic.AtomicReferenceFieldUpdater -internal class SimpleAnnotationsBox(private val annotationsComputer: (PsiModifierList) -> Collection) : AnnotationsBox { +internal class ComputeAllAtOnceAnnotationsBox( + private val annotationsComputer: (PsiModifierList) -> Collection, +) : AnnotationsBox { @Volatile private var cachedAnnotations: Collection? = null @@ -34,7 +36,7 @@ internal class SimpleAnnotationsBox(private val annotationsComputer: (PsiModifie companion object { private val fieldUpdater = AtomicReferenceFieldUpdater.newUpdater( - /* tclass = */ SimpleAnnotationsBox::class.java, + /* tclass = */ ComputeAllAtOnceAnnotationsBox::class.java, /* vclass = */ Collection::class.java, /* fieldName = */ "cachedAnnotations", ) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForObject.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForObject.kt index 2f2db059961..709074968d9 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForObject.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForObject.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.symbols.sourcePsiSafe import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin import org.jetbrains.kotlin.asJava.classes.lazyPub -import org.jetbrains.kotlin.light.classes.symbol.annotations.SimpleAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.ComputeAllAtOnceAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolLightSimpleAnnotation import org.jetbrains.kotlin.light.classes.symbol.annotations.hasDeprecatedAnnotation import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassLike @@ -65,7 +65,7 @@ internal class SymbolLightFieldForObject private constructor( }, computer = ::computeModifiers, ), - annotationsBox = SimpleAnnotationsBox { modifierList -> + annotationsBox = ComputeAllAtOnceAnnotationsBox { modifierList -> listOf(SymbolLightSimpleAnnotation(NotNull::class.java.name, modifierList)) }, )