From fc05fa5b1a0f948d5e3c294908e4438c2591ce88 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 2 Feb 2023 15:09:55 +0100 Subject: [PATCH] [SLC] rename from LazyAnnotationsBox to GranularAnnotationsBox ^KT-56046 --- .../AbstractClassAdditionalAnnotationsProvider.kt | 14 +++++++------- .../annotations/AdditionalAnnotationsProvider.kt | 8 ++++---- .../classes/symbol/annotations/AnnotationFilter.kt | 4 ++-- .../classes/symbol/annotations/AnnotationsBox.kt | 2 +- .../symbol/annotations/AnnotationsProvider.kt | 4 ++-- .../CompositeAdditionalAnnotationsProvider.kt | 2 +- .../EmptyAdditionalAnnotationsProvider.kt | 2 +- ...AnnotationsBox.kt => GranularAnnotationsBox.kt} | 4 ++-- .../MethodAdditionalAnnotationsProvider.kt | 2 +- .../annotations/NullabilityAnnotationsProvider.kt | 2 +- .../SimpleAdditionalAnnotationsProvider.kt | 2 +- .../classes/SymbolLightClassForClassOrObject.kt | 4 ++-- .../symbol/classes/SymbolLightClassForFacade.kt | 2 +- ...ymbolLightClassForInterfaceOrAnnotationClass.kt | 4 ++-- ...olLightClassForRepeatableAnnotationContainer.kt | 2 +- .../symbol/fields/SymbolLightFieldForEnumEntry.kt | 4 ++-- .../symbol/fields/SymbolLightFieldForProperty.kt | 2 +- .../symbol/methods/SymbolLightAccessorMethod.kt | 2 +- .../symbol/methods/SymbolLightConstructor.kt | 4 ++-- .../symbol/methods/SymbolLightSimpleMethod.kt | 2 +- .../symbol/parameters/SymbolLightParameter.kt | 4 ++-- .../parameters/SymbolLightParameterForReceiver.kt | 4 ++-- .../parameters/SymbolLightSetterParameter.kt | 2 +- .../SymbolLightSuspendContinuationParameter.kt | 4 ++-- 24 files changed, 43 insertions(+), 43 deletions(-) rename analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/{LazyAnnotationsBox.kt => GranularAnnotationsBox.kt} (97%) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AbstractClassAdditionalAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AbstractClassAdditionalAnnotationsProvider.kt index 4087eb5bcda..e98f6129130 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AbstractClassAdditionalAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AbstractClassAdditionalAnnotationsProvider.kt @@ -30,7 +30,7 @@ internal object AbstractClassAdditionalAnnotationsProvider : AdditionalAnnotatio } override fun findSpecialAnnotation( - annotationsBox: LazyAnnotationsBox, + annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? = if (owner.parent.isAnnotationClass()) @@ -69,7 +69,7 @@ private fun addAllAnnotationsFromAnnotationClass( } private fun findAdditionalAnnotationFromAnnotationClass( - annotationsBox: LazyAnnotationsBox, + annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? = annotationsBox.tryConvertToRetentionJavaAnnotation(qualifiedName, owner) @@ -78,7 +78,7 @@ private fun findAdditionalAnnotationFromAnnotationClass( ?: annotationsBox.tryConvertToRepeatableJavaAnnotation(qualifiedName, owner) -private fun LazyAnnotationsBox.tryConvertToDocumentedJavaAnnotation( +private fun GranularAnnotationsBox.tryConvertToDocumentedJavaAnnotation( qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? = tryConvertToJavaAnnotation( @@ -96,7 +96,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToDocumentedJavaAnnotation( owner = owner, ) -private fun LazyAnnotationsBox.tryConvertToRetentionJavaAnnotation( +private fun GranularAnnotationsBox.tryConvertToRetentionJavaAnnotation( qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? { @@ -150,7 +150,7 @@ private fun javaRetentionArguments(kotlinRetentionName: String?): List, foundQualifiers: MutableSet, owner: PsiModifierList) /** - * @return **true** if this qualifier should be treated as a **special** in [LazyAnnotationsBox.findAnnotation] - * (should be processed without [LazyAnnotationsBox.getOrComputeCachedAnnotations] call) + * @return **true** if this qualifier should be treated as a **special** in [GranularAnnotationsBox.findAnnotation] + * (should be processed without [GranularAnnotationsBox.getOrComputeCachedAnnotations] call) */ fun isSpecialQualifier(qualifiedName: String): Boolean @@ -44,7 +44,7 @@ internal sealed interface AdditionalAnnotationsProvider { * * @return a new annotation with [qualifiedName] */ - fun findSpecialAnnotation(annotationsBox: LazyAnnotationsBox, qualifiedName: String, owner: PsiModifierList): PsiAnnotation? + fun findSpecialAnnotation(annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList): PsiAnnotation? /** * Adds a new annotation with [qualifier] name to [currentRawAnnotations] and [foundQualifiers] if not already present diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationFilter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationFilter.kt index f1fa79ef1ed..a09e50040f4 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationFilter.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationFilter.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.light.classes.symbol.annotations import com.intellij.psi.PsiAnnotation /** - * Provider a filter for resulted annotations from [LazyAnnotationsBox] + * Provider a filter for resulted annotations from [GranularAnnotationsBox] * - * @see LazyAnnotationsBox + * @see GranularAnnotationsBox */ internal sealed interface AnnotationFilter { /** 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 e4b2bfff8a6..81088cdbcf2 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 @@ -11,7 +11,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. + * [GranularAnnotationsBox] provides an ability to compute each annotation separately and in a lazy way to avoid heavy computation. * [ComputeAllAtOnceAnnotationsBox] provides an ability to compute all annotations once on first access. * [EmptyAnnotationsBox] just a box without annotations. * diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsProvider.kt index 32a5399e700..2f253a3bb03 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/AnnotationsProvider.kt @@ -11,13 +11,13 @@ import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol import org.jetbrains.kotlin.name.ClassId /** - * This class provides annotations to [LazyAnnotationsBox]. + * This class provides annotations to [GranularAnnotationsBox]. * * [EmptyAnnotationsProvider] is just an empty provider. * [SymbolAnnotationsProvider] is a provider based on [KtAnnotatedSymbol] API. * [CompositeAnnotationsProvider] is a composition of some [AnnotationsProvider]. * - * @see [LazyAnnotationsBox] + * @see [GranularAnnotationsBox] */ internal sealed interface AnnotationsProvider { /** diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/CompositeAdditionalAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/CompositeAdditionalAnnotationsProvider.kt index 4197ddee56c..399ef922271 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/CompositeAdditionalAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/CompositeAdditionalAnnotationsProvider.kt @@ -22,7 +22,7 @@ internal class CompositeAdditionalAnnotationsProvider(val providers: List provider.findSpecialAnnotation(annotationsBox, qualifiedName, owner) } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/EmptyAdditionalAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/EmptyAdditionalAnnotationsProvider.kt index a781dc6ffb7..6d8f17a41f9 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/EmptyAdditionalAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/EmptyAdditionalAnnotationsProvider.kt @@ -16,7 +16,7 @@ internal object EmptyAdditionalAnnotationsProvider : AdditionalAnnotationsProvid ) = Unit override fun findSpecialAnnotation( - annotationsBox: LazyAnnotationsBox, + annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? = null diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/LazyAnnotationsBox.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/GranularAnnotationsBox.kt similarity index 97% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/LazyAnnotationsBox.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/GranularAnnotationsBox.kt index b4598551147..d5a0e2bb15b 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/LazyAnnotationsBox.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/GranularAnnotationsBox.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.utils.SmartList import java.util.concurrent.atomic.AtomicReferenceFieldUpdater -internal class LazyAnnotationsBox( +internal class GranularAnnotationsBox( private val annotationsProvider: AnnotationsProvider, private val additionalAnnotationsProvider: AdditionalAnnotationsProvider = EmptyAdditionalAnnotationsProvider, private val annotationFilter: AnnotationFilter = AlwaysAllowedAnnotationFilter, @@ -84,7 +84,7 @@ internal class LazyAnnotationsBox( companion object { private val fieldUpdater = AtomicReferenceFieldUpdater.newUpdater( - /* tclass = */ LazyAnnotationsBox::class.java, + /* tclass = */ GranularAnnotationsBox::class.java, /* vclass = */ Collection::class.java, /* fieldName = */ "cachedAnnotations", ) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/MethodAdditionalAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/MethodAdditionalAnnotationsProvider.kt index 3ba5f602c1f..9081ac71afe 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/MethodAdditionalAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/MethodAdditionalAnnotationsProvider.kt @@ -23,7 +23,7 @@ internal object MethodAdditionalAnnotationsProvider : AdditionalAnnotationsProvi } override fun findSpecialAnnotation( - annotationsBox: LazyAnnotationsBox, + annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? = if (owner.parent.isMethodWithOverride()) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/NullabilityAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/NullabilityAnnotationsProvider.kt index 9a61e84a473..81faa9ab7ed 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/NullabilityAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/NullabilityAnnotationsProvider.kt @@ -24,7 +24,7 @@ internal class NullabilityAnnotationsProvider(private val lazyNullabilityType: L } override fun findSpecialAnnotation( - annotationsBox: LazyAnnotationsBox, + annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? { diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAdditionalAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAdditionalAnnotationsProvider.kt index e67b9d548f5..e1d9e6b297c 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAdditionalAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SimpleAdditionalAnnotationsProvider.kt @@ -24,7 +24,7 @@ internal class SimpleAdditionalAnnotationsProvider( } override fun findSpecialAnnotation( - annotationsBox: LazyAnnotationsBox, + annotationsBox: GranularAnnotationsBox, qualifiedName: String, owner: PsiModifierList, ): PsiAnnotation? { diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt index 7e6e2345359..6a8dbb6d763 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightFieldForEnumEntry import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightFieldForObject @@ -85,7 +85,7 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC SymbolLightClassModifierList( containingDeclaration = this, modifiersBox = GranularModifiersBox(computer = ::computeModifiers), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider(ktModule, classOrObjectSymbolPointer) ), ) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt index ea28f918972..d4e021309b6 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt @@ -67,7 +67,7 @@ class SymbolLightClassForFacade( annotationsBox = if (multiFileClass) { EmptyAnnotationsBox } else { - LazyAnnotationsBox( + GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = this.ktModule, annotatedSymbolPointer = firstFileInFacade.symbolPointerOfType(), diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceOrAnnotationClass.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceOrAnnotationClass.kt index d53d43a3870..ab471c6531e 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceOrAnnotationClass.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceOrAnnotationClass.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.light.classes.symbol.annotations.AbstractClassAdditionalAnnotationsProvider -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.modifierLists.GranularModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList @@ -72,7 +72,7 @@ internal abstract class SymbolLightClassForInterfaceOrAnnotationClass : SymbolLi initialValue = GranularModifiersBox.MODALITY_MODIFIERS_MAP.with(PsiModifier.ABSTRACT), computer = ::computeModifiers ), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider(ktModule, classOrObjectSymbolPointer), additionalAnnotationsProvider = AbstractClassAdditionalAnnotationsProvider, ), diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForRepeatableAnnotationContainer.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForRepeatableAnnotationContainer.kt index dbc12516b63..f0318669a41 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForRepeatableAnnotationContainer.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForRepeatableAnnotationContainer.kt @@ -40,7 +40,7 @@ internal class SymbolLightClassForRepeatableAnnotationContainer(private val cont // It is marked as Abstract because all the annotation classes are marked as Abstract // It is marked as Static because all nested interfaces are marked as Static modifiersBox = InitializedModifiersBox(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.ABSTRACT), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = classOrObjectSymbolPointer, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt index fd5c16f8810..5d28874bb1a 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.symbolPointerOfType import org.jetbrains.kotlin.asJava.classes.cannotModify import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.light.classes.symbol.analyzeForLightClasses -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.annotations.annotationUseSiteTargetFilterOf import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassOrObject @@ -41,7 +41,7 @@ internal class SymbolLightFieldForEnumEntry( SymbolLightMemberModifierList( containingDeclaration = this, modifiersBox = InitializedModifiersBox(PsiModifier.STATIC, PsiModifier.FINAL, PsiModifier.PUBLIC), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = enumEntry.symbolPointerOfType(), diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt index 416fe2c2230..d96f7b4fc6d 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt @@ -153,7 +153,7 @@ internal class SymbolLightFieldForProperty private constructor( SymbolLightMemberModifierList( containingDeclaration = this, modifiersBox = GranularModifiersBox(initializerValue, ::computeModifiers), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = propertySymbolPointer, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt index f6987172dc8..afd8d4e349f 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt @@ -186,7 +186,7 @@ internal class SymbolLightAccessorMethod private constructor( SymbolLightMemberModifierList( containingDeclaration = this, modifiersBox = GranularModifiersBox(computer = ::computeModifiers), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = CompositeAnnotationsProvider( SymbolAnnotationsProvider( ktModule = ktModule, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightConstructor.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightConstructor.kt index 419fa1db086..1762c2e3529 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightConstructor.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightConstructor.kt @@ -9,7 +9,7 @@ import com.intellij.psi.* import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol import org.jetbrains.kotlin.asJava.classes.lazyPub -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassBase import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForEnumEntry @@ -56,7 +56,7 @@ internal class SymbolLightConstructor( initialValue = initialValue, computer = ::computeModifiers, ), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = functionSymbolPointer, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt index 7ca9a14b24f..cca275f1d64 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt @@ -141,7 +141,7 @@ internal class SymbolLightSimpleMethod( SymbolLightMemberModifierList( containingDeclaration = this, modifiersBox = GranularModifiersBox(computer = ::computeModifiers), - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = functionSymbolPointer, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameter.kt index 7852fe65eff..157120d8c68 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameter.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameter.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.NullabilityAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.annotations.toFilterWithAdditionalNull @@ -31,7 +31,7 @@ internal class SymbolLightParameter( private val _modifierList: PsiModifierList by lazyPub { SymbolLightClassModifierList( containingDeclaration = this, - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = parameterSymbolPointer, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt index c8e0183b4b2..77af86dad98 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterForReceiver.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.light.classes.symbol.* -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.NullabilityAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.annotations.toFilterWithAdditionalNull @@ -68,7 +68,7 @@ internal class SymbolLightParameterForReceiver private constructor( private val _modifierList: PsiModifierList by lazyPub { SymbolLightClassModifierList( containingDeclaration = this, - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, annotatedSymbolPointer = receiverPointer, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt index 2ba61b75d7a..fee86c948af 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSetterParameter.kt @@ -41,7 +41,7 @@ internal class SymbolLightSetterParameter( private val _modifierList: PsiModifierList by lazyPub { SymbolLightClassModifierList( containingDeclaration = this, - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = CompositeAnnotationsProvider( SymbolAnnotationsProvider( ktModule = ktModule, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt index 75bbb506bd4..594a78726e3 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME import org.jetbrains.kotlin.light.classes.symbol.NullabilityType import org.jetbrains.kotlin.light.classes.symbol.annotations.EmptyAnnotationsProvider -import org.jetbrains.kotlin.light.classes.symbol.annotations.LazyAnnotationsBox +import org.jetbrains.kotlin.light.classes.symbol.annotations.GranularAnnotationsBox import org.jetbrains.kotlin.light.classes.symbol.annotations.NullabilityAnnotationsProvider import org.jetbrains.kotlin.light.classes.symbol.isValid import org.jetbrains.kotlin.light.classes.symbol.methods.SymbolLightMethodBase @@ -56,7 +56,7 @@ internal class SymbolLightSuspendContinuationParameter( private val _modifierList: PsiModifierList by lazyPub { SymbolLightClassModifierList( containingDeclaration = this, - annotationsBox = LazyAnnotationsBox( + annotationsBox = GranularAnnotationsBox( annotationsProvider = EmptyAnnotationsProvider, additionalAnnotationsProvider = NullabilityAnnotationsProvider { if (withFunctionSymbol { it.visibility.isPrivateOrPrivateToThis() })