From c05a47355e7cd7a38aec0dbf6019fee2710b704d Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 2 Feb 2023 15:05:50 +0100 Subject: [PATCH] [SLC] rename from SimpleModifiersBox to InitializedModifiersBox ^KT-56046 --- .../classes/symbol/classes/SymbolLightClassForEnumEntry.kt | 4 ++-- .../light/classes/symbol/classes/SymbolLightClassForFacade.kt | 4 ++-- .../classes/SymbolLightClassForInterfaceDefaultImpls.kt | 4 ++-- .../SymbolLightClassForRepeatableAnnotationContainer.kt | 4 ++-- .../classes/symbol/fields/SymbolLightFieldForEnumEntry.kt | 4 ++-- .../classes/symbol/methods/SymbolLightNoArgConstructor.kt | 4 ++-- .../methods/SymbolLightRepeatableAnnotationContainerMethod.kt | 4 ++-- .../{SimpleModifiersBox.kt => InitializedModifiersBox.kt} | 2 +- .../kotlin/light/classes/symbol/modifierLists/ModifiersBox.kt | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/{SimpleModifiersBox.kt => InitializedModifiersBox.kt} (82%) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt index e0ac0aa2567..7ec58fc3572 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.light.classes.symbol.codeReferences.SymbolLightPsiJavaCodeReferenceElementWithNoReference import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightFieldForEnumEntry import org.jetbrains.kotlin.light.classes.symbol.isOriginEquivalentTo -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind import org.jetbrains.kotlin.psi.KtEnumEntry @@ -53,7 +53,7 @@ internal class SymbolLightClassForEnumEntry( private val _modifierList: PsiModifierList by lazyPub { SymbolLightClassModifierList( containingDeclaration = this, - modifiersBox = SimpleModifiersBox(PsiModifier.STATIC, PsiModifier.FINAL), + modifiersBox = InitializedModifiersBox(PsiModifier.STATIC, PsiModifier.FINAL), ) } 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 6804950c0f2..ea28f918972 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.light.classes.symbol.analyzeForLightClasses import org.jetbrains.kotlin.light.classes.symbol.annotations.* import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightField -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.light.classes.symbol.toPsiVisibilityForMember import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind @@ -63,7 +63,7 @@ class SymbolLightClassForFacade( private val _modifierList: PsiModifierList by lazyPub { SymbolLightClassModifierList( containingDeclaration = this, - modifiersBox = SimpleModifiersBox(PsiModifier.PUBLIC, PsiModifier.FINAL), + modifiersBox = InitializedModifiersBox(PsiModifier.PUBLIC, PsiModifier.FINAL), annotationsBox = if (multiFileClass) { EmptyAnnotationsBox } else { diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt index 6d47fa35a28..e45f4036e23 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.light.classes.symbol.classes import com.intellij.psi.* import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.load.java.JvmAbi @@ -40,7 +40,7 @@ internal class SymbolLightClassForInterfaceDefaultImpls(private val containingCl override fun computeModifierList(): PsiModifierList = SymbolLightClassModifierList( containingDeclaration = this, - modifiersBox = SimpleModifiersBox(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.FINAL), + modifiersBox = InitializedModifiersBox(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.FINAL), ) override fun classKind(): KtClassKind = KtClassKind.CLASS 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 12721c764a2..dbc12516b63 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 @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.light.classes.symbol.annotations.* import org.jetbrains.kotlin.light.classes.symbol.methods.SymbolLightRepeatableAnnotationContainerMethod -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.load.java.JvmAbi @@ -39,7 +39,7 @@ internal class SymbolLightClassForRepeatableAnnotationContainer(private val cont containingDeclaration = this, // 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 = SimpleModifiersBox(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.ABSTRACT), + modifiersBox = InitializedModifiersBox(PsiModifier.PUBLIC, PsiModifier.STATIC, PsiModifier.ABSTRACT), annotationsBox = LazyAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, 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 3722747a8ef..fd5c16f8810 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 @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.light.classes.symbol.annotations.annotationUseSiteTa import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassOrObject import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForEnumEntry import org.jetbrains.kotlin.light.classes.symbol.isOriginEquivalentTo -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList import org.jetbrains.kotlin.light.classes.symbol.nonExistentType import org.jetbrains.kotlin.psi.KtEnumEntry @@ -40,7 +40,7 @@ internal class SymbolLightFieldForEnumEntry( private val _modifierList by lazyPub { SymbolLightMemberModifierList( containingDeclaration = this, - modifiersBox = SimpleModifiersBox(PsiModifier.STATIC, PsiModifier.FINAL, PsiModifier.PUBLIC), + modifiersBox = InitializedModifiersBox(PsiModifier.STATIC, PsiModifier.FINAL, PsiModifier.PUBLIC), annotationsBox = LazyAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule, diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightNoArgConstructor.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightNoArgConstructor.kt index 4e1f2d2836d..5af80f73f30 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightNoArgConstructor.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightNoArgConstructor.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassBase -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList import org.jetbrains.kotlin.light.classes.symbol.parameters.SymbolLightParameterList @@ -39,7 +39,7 @@ internal class SymbolLightNoArgConstructor( private val _modifierList: PsiModifierList by lazyPub { SymbolLightMemberModifierList( containingDeclaration = this, - modifiersBox = SimpleModifiersBox(visibility), + modifiersBox = InitializedModifiersBox(visibility), ) } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightRepeatableAnnotationContainerMethod.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightRepeatableAnnotationContainerMethod.kt index bf57dbc136e..bf15e1ace99 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightRepeatableAnnotationContainerMethod.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightRepeatableAnnotationContainerMethod.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_BASE import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassBase -import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SimpleModifiersBox +import org.jetbrains.kotlin.light.classes.symbol.modifierLists.InitializedModifiersBox import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList import org.jetbrains.kotlin.light.classes.symbol.parameters.SymbolLightParameterList @@ -33,7 +33,7 @@ internal class SymbolLightRepeatableAnnotationContainerMethod( private val _modifierList by lazyPub { SymbolLightMemberModifierList( containingDeclaration = this, - modifiersBox = SimpleModifiersBox(PsiModifier.PUBLIC, PsiModifier.ABSTRACT), + modifiersBox = InitializedModifiersBox(PsiModifier.PUBLIC, PsiModifier.ABSTRACT), ) } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SimpleModifiersBox.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/InitializedModifiersBox.kt similarity index 82% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SimpleModifiersBox.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/InitializedModifiersBox.kt index cbf428a42a9..a582d7ce40d 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/SimpleModifiersBox.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/InitializedModifiersBox.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.light.classes.symbol.modifierLists -internal class SimpleModifiersBox(private val modifiers: Set) : ModifiersBox { +internal class InitializedModifiersBox(private val modifiers: Set) : ModifiersBox { constructor(vararg modifiers: String) : this(modifiers.toSet()) override fun hasModifier(modifier: String): Boolean = modifier in modifiers diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/ModifiersBox.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/ModifiersBox.kt index d8cb0ac10d4..3dba718889d 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/ModifiersBox.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/ModifiersBox.kt @@ -9,7 +9,7 @@ package org.jetbrains.kotlin.light.classes.symbol.modifierLists * This class is used as a proxy for [com.intellij.psi.PsiModifierList.hasModifierProperty]. * * [LazyModifiersBox] provides an ability to compute each modifier separately to avoid heavy computation. - * [SimpleModifiersBox] is a collection of possible modifiers. + * [InitializedModifiersBox] is a collection of possible modifiers. * [EmptyModifiersBox] just a box without modifiers. * * @see SymbolLightModifierList