From c38a7933529f289cb7ab29bd8d5412ff9894c78b Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 22 Mar 2021 12:24:11 +0100 Subject: [PATCH] FIR IDE: replace custom KtSymbolVisibility with compiler common Visibility --- .../symbols/markers/KtSymbolWithVisibility.kt | 18 +- .../asJava/classes/FirLightClassForSymbol.kt | 4 +- .../kotlin/idea/asJava/firLightUtils.kt | 10 +- .../idea/asJava/methods/FirLightMethod.kt | 6 +- .../api/fir/symbols/KtFirConstructorSymbol.kt | 4 +- .../api/fir/symbols/KtFirFunctionSymbol.kt | 3 +- .../api/fir/symbols/KtFirJavaFieldSymbol.kt | 4 +- .../fir/symbols/KtFirKotlinPropertySymbol.kt | 3 +- .../symbols/KtFirNamedClassOrObjectSymbol.kt | 3 +- .../fir/symbols/KtFirPropertyGetterSymbol.kt | 4 +- .../fir/symbols/KtFirPropertySetterSymbol.kt | 3 +- .../KtFirSyntheticJavaPropertySymbol.kt | 3 +- .../api/fir/symbols/firSymbolUtils.kt | 21 +-- .../fileScopeTest/simpleFileScope.kt.result | 8 +- .../testData/memberScopeByFqName/Int.kt | 126 +++++++------- .../memberScopeByFqName/MutableList.kt | 48 +++--- .../memberScopeByFqName/java.lang.String.kt | 156 +++++++++--------- .../memberScopeByFqName/kotlin.Function2.kt | 8 +- .../testData/symbols/symbolByFqName/class.kt | 2 +- .../symbols/symbolByFqName/classFromJdk.kt | 2 +- .../symbolByFqName/fileWalkDirectionEnum.kt | 6 +- .../symbols/symbolByFqName/iterator.kt | 2 +- .../testData/symbols/symbolByFqName/listOf.kt | 2 +- .../symbols/symbolByFqName/memberFunction.kt | 2 +- .../memberFunctionWithOverloads.kt | 4 +- .../symbols/symbolByFqName/nestedClass.kt | 2 +- .../symbols/symbolByPsi/annotations.kt | 8 +- .../symbols/symbolByPsi/anonymousObject.kt | 8 +- .../testData/symbols/symbolByPsi/class.kt | 2 +- .../symbols/symbolByPsi/classMembes.kt | 6 +- .../symbolByPsi/classPrimaryConstructor.kt | 4 +- .../symbolByPsi/classSecondaryConstructors.kt | 8 +- .../symbolByPsi/classWithTypeParams.kt | 2 +- .../testData/symbols/symbolByPsi/enum.kt | 2 +- .../symbols/symbolByPsi/extensionFunction.kt | 2 +- .../testData/symbols/symbolByPsi/function.kt | 2 +- .../symbolByPsi/functionWithTypeParams.kt | 2 +- .../symbols/symbolByPsi/implicitReturn.kt | 2 +- .../symbols/symbolByPsi/localDeclarations.kt | 6 +- .../symbols/symbolByPsi/memberFunctions.kt | 6 +- .../symbols/symbolByPsi/memberProperties.kt | 8 +- .../symbols/symbolByPsi/topLevelFunctions.kt | 4 +- .../symbols/symbolByPsi/topLevelProperties.kt | 6 +- .../symbols/symbolByPsi/typeAnnotations.kt | 16 +- .../constructorViaTypeAlias.kt | 2 +- 45 files changed, 268 insertions(+), 282 deletions(-) diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt index 644995501b8..a9ee1480c39 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt @@ -5,19 +5,13 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols.markers +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility + interface KtSymbolWithVisibility { - val visibility: KtSymbolVisibility + val visibility: Visibility } -sealed class KtSymbolVisibility { - object PUBLIC : KtSymbolVisibility() - object PRIVATE : KtSymbolVisibility() - object PRIVATE_TO_THIS : KtSymbolVisibility() - object PROTECTED : KtSymbolVisibility() - object INTERNAL : KtSymbolVisibility() - object UNKNOWN : KtSymbolVisibility() - object LOCAL : KtSymbolVisibility() -} -fun KtSymbolVisibility.isPrivateOrPrivateToThis(): Boolean = - this == KtSymbolVisibility.PRIVATE || this == KtSymbolVisibility.PRIVATE_TO_THIS \ No newline at end of file +fun Visibility.isPrivateOrPrivateToThis(): Boolean = + this == Visibilities.Private || this == Visibilities.PrivateToThis \ No newline at end of file diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt index 59b46af647f..0f93c9c97db 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt @@ -9,12 +9,12 @@ import com.intellij.psi.* import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.elements.KtLightMethod +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.idea.asJava.classes.* import org.jetbrains.kotlin.idea.frontend.api.fir.analyzeWithSymbolAsContext import org.jetbrains.kotlin.idea.frontend.api.isValid import org.jetbrains.kotlin.idea.frontend.api.symbols.* import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility import org.jetbrains.kotlin.load.java.JvmAbi @@ -27,7 +27,7 @@ internal class FirLightClassForSymbol( require(classOrObjectSymbol.classKind != KtClassKind.INTERFACE && classOrObjectSymbol.classKind != KtClassKind.ANNOTATION_CLASS) } - internal fun tryGetEffectiveVisibility(symbol: KtCallableSymbol): KtSymbolVisibility? { + internal fun tryGetEffectiveVisibility(symbol: KtCallableSymbol): Visibility? { if (symbol !is KtPropertySymbol && symbol !is KtFunctionSymbol) return null diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt index 3a03efe0849..3878ea38ffd 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMember import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.backend.jvm.jvmTypeMapper import org.jetbrains.kotlin.fir.declarations.* @@ -236,15 +238,15 @@ internal fun KtSymbolWithVisibility.toPsiVisibilityForMember(isTopLevel: Boolean internal fun KtSymbolWithVisibility.toPsiVisibilityForClass(isTopLevel: Boolean): String = visibility.toPsiVisibility(isTopLevel, forClass = true) -internal fun KtSymbolVisibility.toPsiVisibilityForMember(isTopLevel: Boolean): String = +internal fun Visibility.toPsiVisibilityForMember(isTopLevel: Boolean): String = toPsiVisibility(isTopLevel, forClass = false) -private fun KtSymbolVisibility.toPsiVisibility(isTopLevel: Boolean, forClass: Boolean): String = when (this) { +private fun Visibility.toPsiVisibility(isTopLevel: Boolean, forClass: Boolean): String = when (this) { // Top-level private class has PACKAGE_LOCAL visibility in Java // Nested private class has PRIVATE visibility - KtSymbolVisibility.PRIVATE, KtSymbolVisibility.PRIVATE_TO_THIS -> + Visibilities.Private, Visibilities.PrivateToThis -> if (forClass && isTopLevel) PsiModifier.PACKAGE_LOCAL else PsiModifier.PRIVATE - KtSymbolVisibility.PROTECTED -> PsiModifier.PROTECTED + Visibilities.Protected -> PsiModifier.PROTECTED else -> PsiModifier.PUBLIC } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt index 75a3ff71375..06a050a6c7c 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightMethod.kt @@ -16,11 +16,11 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.cannotModify import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.idea.frontend.api.isValid import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotatedSymbol -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility import org.jetbrains.kotlin.idea.util.ifTrue import org.jetbrains.kotlin.idea.util.module @@ -89,11 +89,11 @@ internal abstract class FirLightMethod( ): String where T : KtAnnotatedSymbol, T : KtSymbolWithVisibility, T : KtCallableSymbol { getJvmNameFromAnnotation(annotationUseSiteTarget)?.let { return it } - val effectiveVisibilityIfNotInternal = (visibility != KtSymbolVisibility.INTERNAL).ifTrue { + val effectiveVisibilityIfNotInternal = (visibility != Visibilities.Internal).ifTrue { (containingClass as? FirLightClassForSymbol)?.tryGetEffectiveVisibility(this) } ?: this.visibility - if (effectiveVisibilityIfNotInternal != KtSymbolVisibility.INTERNAL) return defaultName + if (effectiveVisibilityIfNotInternal != Visibilities.Internal) return defaultName val moduleName = module?.name ?: return defaultName diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt index 48c9628e766..ef1c514bd5e 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -25,7 +26,6 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtValueParameterSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer @@ -54,7 +54,7 @@ internal class KtFirConstructorSymbol( } } - override val visibility: KtSymbolVisibility get() = getVisibility() + override val visibility: Visibility get() = getVisibility() override val annotations: List by cached { firRef.toAnnotationsList() } override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt index 685dde59f43..e7ad06b89b7 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.idea.fir.findPsi @@ -91,7 +92,7 @@ internal class KtFirFunctionSymbol( } override val modality: KtCommonSymbolModality get() = getModality() - override val visibility: KtSymbolVisibility get() = getVisibility() + override val visibility: Visibility get() = getVisibility() override fun createPointer(): KtSymbolPointer { KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt index fc623708da6..98751a466d9 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.FirField import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.idea.fir.findPsi @@ -18,7 +19,6 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtJavaFieldSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.name.FqName @@ -47,7 +47,7 @@ internal class KtFirJavaFieldSymbol( override val modality: KtCommonSymbolModality get() = getModality() - override val visibility: KtSymbolVisibility get() = getVisibility() + override val visibility: Visibility get() = getVisibility() override fun createPointer(): KtSymbolPointer { TODO("Creating pointers for java fields is not supported yet") diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt index 4221e4325cd..963e90f4716 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty @@ -76,7 +77,7 @@ internal class KtFirKotlinPropertySymbol( } override val modality: KtCommonSymbolModality get() = getModality() - override val visibility: KtSymbolVisibility get() = getVisibility() + override val visibility: Visibility get() = getVisibility() override val annotations: List by cached { firRef.toAnnotationsList() } override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt index 3937d9e74b2..aed464f5f33 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState @@ -45,7 +46,7 @@ internal class KtFirNamedClassOrObjectSymbol( override val modality: KtSymbolModality get() = getModality() - override val visibility: KtSymbolVisibility get() = getVisibility() + override val visibility: Visibility get() = getVisibility() override val annotations: List by cached { firRef.toAnnotationsList() } override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt index 8f7baa8b2c0..9fcc12d5167 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor import org.jetbrains.kotlin.idea.fir.findPsi @@ -56,8 +57,7 @@ internal class KtFirPropertyGetterSymbol( firRef.returnTypeAndAnnotations(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE, builder) } override val modality: KtCommonSymbolModality get() = firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() } - override val visibility: KtSymbolVisibility get() = firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() } - + override val visibility: Visibility get() = getVisibility() override val annotations: List by cached { firRef.toAnnotationsList() } override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt index f0e4f94616a..3cad2e12c30 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor import org.jetbrains.kotlin.idea.fir.findPsi @@ -46,7 +47,7 @@ internal class KtFirPropertySetterSymbol( override val hasBody: Boolean get() = firRef.withFir { it.body != null } override val modality: KtCommonSymbolModality get() = firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() } - override val visibility: KtSymbolVisibility get() = firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() } + override val visibility: Visibility get() = getVisibility() override val annotations: List by cached { firRef.toAnnotationsList() } override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt index e6b8d9f05df..65eb6031707 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty @@ -59,7 +60,7 @@ internal class KtFirSyntheticJavaPropertySymbol( override val initializer: KtConstantValue? by firRef.withFirAndCache(FirResolvePhase.BODY_RESOLVE) { fir -> fir.initializer?.convertConstantExpression() } override val modality: KtCommonSymbolModality get() = getModality() - override val visibility: KtSymbolVisibility get() = getVisibility() + override val visibility: Visibility get() = getVisibility() override val annotations: List by cached { firRef.toAnnotationsList() } override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt index b02bb32eca4..721ae3a465d 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt @@ -6,9 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.descriptors.java.JavaVisibilities import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -21,7 +19,7 @@ import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolModality -import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility +import org.jetbrains.kotlin.metadata.ProtoBuf internal inline fun Modality?.getSymbolModality(): M = when (this) { Modality.FINAL -> KtCommonSymbolModality.FINAL @@ -35,21 +33,8 @@ internal inline fun KtF firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() } -internal fun Visibility?.getSymbolVisibility(): KtSymbolVisibility = when (this) { - Visibilities.Public -> KtSymbolVisibility.PUBLIC - Visibilities.Protected -> KtSymbolVisibility.PROTECTED - Visibilities.Private -> KtSymbolVisibility.PRIVATE - Visibilities.PrivateToThis -> KtSymbolVisibility.PRIVATE_TO_THIS - Visibilities.Internal -> KtSymbolVisibility.INTERNAL - Visibilities.Local -> KtSymbolVisibility.LOCAL - Visibilities.Unknown -> KtSymbolVisibility.UNKNOWN - JavaVisibilities.PackageVisibility -> KtSymbolVisibility.UNKNOWN //TODO: Add Java visibilities - null -> error("Symbol visibility should not be null, looks like the fir symbol was not properly resolved") - else -> throw NotImplementedError("Unknown visibility $name") -} - -internal fun KtFirSymbol.getVisibility(): KtSymbolVisibility = - firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() } +internal fun KtFirSymbol.getVisibility(): Visibility = + firRef.withFir(FirResolvePhase.STATUS) { fir -> fir.visibility } internal fun ConeClassLikeType.expandTypeAliasIfNeeded(session: FirSession): ConeClassLikeType { diff --git a/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result b/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result index ad35a65f4ce..6156005dbf3 100644 --- a/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result +++ b/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result @@ -27,7 +27,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -51,7 +51,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL - visibility: PUBLIC + visibility: Public CLASSIFIER NAMES: [C, I] @@ -74,7 +74,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -93,4 +93,4 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt index 2f8b5d65aa0..5e0e0473b64 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt @@ -24,7 +24,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -45,7 +45,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -66,7 +66,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -87,7 +87,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -108,7 +108,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -129,7 +129,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -150,7 +150,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -171,7 +171,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -192,7 +192,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -213,7 +213,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -234,7 +234,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -255,7 +255,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -276,7 +276,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -297,7 +297,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -318,7 +318,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -339,7 +339,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -360,7 +360,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -381,7 +381,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -402,7 +402,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -423,7 +423,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -444,7 +444,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -465,7 +465,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -486,7 +486,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -507,7 +507,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -528,7 +528,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -549,7 +549,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -570,7 +570,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -591,7 +591,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -612,7 +612,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange @@ -633,7 +633,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange @@ -654,7 +654,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/LongRange @@ -675,7 +675,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange @@ -696,7 +696,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -717,7 +717,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -738,7 +738,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -759,7 +759,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -780,7 +780,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -801,7 +801,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -822,7 +822,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -843,7 +843,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bitCount)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -864,7 +864,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bitCount)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -885,7 +885,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -906,7 +906,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -927,7 +927,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -948,7 +948,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -969,7 +969,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -990,7 +990,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Byte @@ -1011,7 +1011,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Char @@ -1032,7 +1032,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Double @@ -1053,7 +1053,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Float @@ -1074,7 +1074,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1095,7 +1095,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Long @@ -1116,7 +1116,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Short @@ -1137,7 +1137,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1158,7 +1158,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1179,7 +1179,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1200,7 +1200,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bitCount)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1221,7 +1221,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -1242,7 +1242,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -1263,7 +1263,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/String @@ -1284,7 +1284,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -1303,7 +1303,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: MEMBER typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] kotlin/Int @@ -1316,5 +1316,5 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PRIVATE + visibility: Private */ diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt index 30f4c5f9227..16d2750c612 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt @@ -21,7 +21,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -42,7 +42,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -63,7 +63,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(elements)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -84,7 +84,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(elements)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -105,7 +105,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator @@ -126,7 +126,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator @@ -147,7 +147,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -168,7 +168,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -189,7 +189,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(elements)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] E @@ -210,7 +210,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -231,7 +231,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(elements)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] E @@ -252,7 +252,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableList @@ -273,7 +273,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(fromIndex), KtFirValueParameterSymbol(toIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -294,7 +294,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -315,7 +315,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(elements)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] E @@ -336,7 +336,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -357,7 +357,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -378,7 +378,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableIterator @@ -399,7 +399,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -420,7 +420,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -444,7 +444,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -465,7 +465,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -486,7 +486,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/String @@ -507,5 +507,5 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt index 841609e8fda..9a18532f164 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt @@ -12,7 +12,7 @@ KtFirJavaFieldSymbol: name: value origin: JAVA symbolKind: MEMBER - visibility: PRIVATE + visibility: Private KtFirJavaFieldSymbol: annotatedType: [] kotlin/Int @@ -22,7 +22,7 @@ KtFirJavaFieldSymbol: name: hash origin: JAVA symbolKind: MEMBER - visibility: PRIVATE + visibility: Private KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -43,7 +43,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: UNKNOWN + visibility: PackageVisibility KtFirJavaFieldSymbol: annotatedType: [] kotlin/Int @@ -53,7 +53,7 @@ KtFirJavaFieldSymbol: name: hash32 origin: JAVA symbolKind: MEMBER - visibility: PRIVATE + visibility: Private KtFirSyntheticJavaPropertySymbol: annotatedType: [] kotlin/Int @@ -77,7 +77,7 @@ KtFirSyntheticJavaPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -98,7 +98,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Char @@ -119,7 +119,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -140,7 +140,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -161,7 +161,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -182,7 +182,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(beginIndex), KtFirValueParameterSymbol(endIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -203,7 +203,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index), KtFirValueParameterSymbol(codePointOffset)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -224,7 +224,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(dst), KtFirValueParameterSymbol(dstBegin)] - visibility: UNKNOWN + visibility: PackageVisibility KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -245,7 +245,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(srcBegin), KtFirValueParameterSymbol(srcEnd), KtFirValueParameterSymbol(dst), KtFirValueParameterSymbol(dstBegin)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -266,7 +266,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(srcBegin), KtFirValueParameterSymbol(srcEnd), KtFirValueParameterSymbol(dst), KtFirValueParameterSymbol(dstBegin)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/ByteArray @@ -287,7 +287,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(charsetName)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/ByteArray @@ -308,7 +308,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(charset)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/ByteArray @@ -329,7 +329,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -350,7 +350,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(anObject)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -371,7 +371,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(sb)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -392,7 +392,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(cs)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -413,7 +413,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(anotherString)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -434,7 +434,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(anotherString)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -455,7 +455,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(str)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -476,7 +476,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(toffset), KtFirValueParameterSymbol(other), KtFirValueParameterSymbol(ooffset), KtFirValueParameterSymbol(len)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -497,7 +497,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ignoreCase), KtFirValueParameterSymbol(toffset), KtFirValueParameterSymbol(other), KtFirValueParameterSymbol(ooffset), KtFirValueParameterSymbol(len)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -518,7 +518,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(prefix), KtFirValueParameterSymbol(toffset)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -539,7 +539,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(prefix)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -560,7 +560,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(suffix)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -581,7 +581,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -602,7 +602,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ch)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -623,7 +623,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -644,7 +644,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(str)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -665,7 +665,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(str), KtFirValueParameterSymbol(fromIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -686,7 +686,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)] - visibility: PRIVATE + visibility: Private KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -707,7 +707,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ch)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -728,7 +728,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -749,7 +749,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(str)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -770,7 +770,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(str), KtFirValueParameterSymbol(fromIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -791,7 +791,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ch), KtFirValueParameterSymbol(fromIndex)] - visibility: PRIVATE + visibility: Private KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -812,7 +812,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(beginIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -833,7 +833,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(beginIndex), KtFirValueParameterSymbol(endIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/CharSequence @@ -854,7 +854,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(beginIndex), KtFirValueParameterSymbol(endIndex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -875,7 +875,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(str)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -896,7 +896,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(oldChar), KtFirValueParameterSymbol(newChar)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -917,7 +917,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(target), KtFirValueParameterSymbol(replacement)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -938,7 +938,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(regex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -959,7 +959,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(s)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -980,7 +980,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(regex), KtFirValueParameterSymbol(replacement)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1001,7 +1001,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(regex), KtFirValueParameterSymbol(replacement)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] ft<@EnhancedNullability kotlin/Array>, @EnhancedNullability kotlin/Array>> @@ -1022,7 +1022,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(regex), KtFirValueParameterSymbol(limit)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] ft<@EnhancedNullability kotlin/Array>, @EnhancedNullability kotlin/Array>> @@ -1043,7 +1043,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(regex)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1064,7 +1064,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(locale)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1085,7 +1085,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1106,7 +1106,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(locale)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1127,7 +1127,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1148,7 +1148,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1169,7 +1169,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/CharArray @@ -1190,7 +1190,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String @@ -1211,7 +1211,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Char @@ -1232,7 +1232,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -1251,7 +1251,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any, [] java/util/Comparator>, [] java/io/Serializable] symbolKind: MEMBER typeParameters: [] - visibility: PRIVATE + visibility: Private KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1264,7 +1264,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1277,7 +1277,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(original)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1290,7 +1290,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(value)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1303,7 +1303,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(value), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1316,7 +1316,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(codePoints), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1329,7 +1329,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ascii), KtFirValueParameterSymbol(hibyte), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1342,7 +1342,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(ascii), KtFirValueParameterSymbol(hibyte)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1355,7 +1355,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length), KtFirValueParameterSymbol(charsetName)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1368,7 +1368,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length), KtFirValueParameterSymbol(charset)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1381,7 +1381,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(charsetName)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1394,7 +1394,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(charset)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1407,7 +1407,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes), KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(length)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1420,7 +1420,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(bytes)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1433,7 +1433,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(buffer)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1446,7 +1446,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(builder)] - visibility: PUBLIC + visibility: Public KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1459,7 +1459,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(value), KtFirValueParameterSymbol(share)] - visibility: UNKNOWN + visibility: PackageVisibility KtFirConstructorSymbol: annotatedType: [] java/lang/String @@ -1472,5 +1472,5 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(offset), KtFirValueParameterSymbol(count), KtFirValueParameterSymbol(value)] - visibility: UNKNOWN + visibility: PackageVisibility */ diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.kt b/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.kt index 506ac8bde23..c869f71969e 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.kt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.kt @@ -23,7 +23,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(p1), KtFirValueParameterSymbol(p2)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean @@ -44,7 +44,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(other)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -65,7 +65,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/String @@ -86,5 +86,5 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.kt index bd4bc9b1524..0ed1e5c8062 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/class.kt @@ -21,5 +21,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(T)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.kt index 3de352f72b4..c7a69e008aa 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/classFromJdk.kt @@ -21,5 +21,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any, [] java/io/Serializable, [] kotlin/Comparable>, [] kotlin/CharSequence] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.kt index 40269e0d819..1cc289d4232 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.kt @@ -23,7 +23,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(T)] valueParameters: [KtFirValueParameterSymbol(element)] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List @@ -44,7 +44,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(T)] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List @@ -65,5 +65,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(T)] valueParameters: [KtFirValueParameterSymbol(elements)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.kt index 882d2b31deb..6dfc0c07efa 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/iterator.kt @@ -19,5 +19,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(T)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.kt index 715c76aee92..25992181903 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/listOf.kt @@ -21,5 +21,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Enum] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.kt index fb003d3b1e3..be1af7761ba 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.kt @@ -21,5 +21,5 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt index c29480dbfbf..275ae1a825e 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt @@ -21,7 +21,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/collections/ListIterator @@ -42,5 +42,5 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(index)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.kt b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.kt index 667f624c480..342eb00d115 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByFqName/nestedClass.kt @@ -19,5 +19,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/collections/Map.Entry] symbolKind: MEMBER typeParameters: [KtFirTypeParameterSymbol(K), KtFirTypeParameterSymbol(V)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt index 6001cb62c74..bf83e6c6791 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt @@ -41,7 +41,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(param1), KtFirValueParameterSymbol(param2)] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -60,7 +60,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Annotation] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -81,7 +81,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [Anno] @@ -100,5 +100,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.kt index fe21d745838..1a7f0bdf03e 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.kt @@ -28,7 +28,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -52,7 +52,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirAnonymousObjectSymbol: annotationClassIds: [] @@ -86,7 +86,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -105,5 +105,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.kt index ec99d3b7c71..09eba53dfb8 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/class.kt @@ -20,5 +20,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.kt index 9a92a9ece12..459e0a7384f 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.kt @@ -27,7 +27,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Int @@ -48,7 +48,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -67,5 +67,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt index 6783f671562..2a200eb9062 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt @@ -14,7 +14,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -33,5 +33,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt index b550003bdfc..044eeabc071 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt @@ -16,7 +16,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirValueParameterSymbol: annotatedType: [] kotlin/Int @@ -39,7 +39,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(x)] - visibility: PUBLIC + visibility: Public KtFirValueParameterSymbol: annotatedType: [] kotlin/Int @@ -72,7 +72,7 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(y), KtFirValueParameterSymbol(z)] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -91,5 +91,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.kt index dab7b67e5e8..a1f3dfdcd5c 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/classWithTypeParams.kt @@ -34,5 +34,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(T), KtFirTypeParameterSymbol(R)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt index 4863e3e79bd..764ad20e6c9 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt @@ -35,5 +35,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Enum] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.kt index 254472e2c60..9fd14a3d9ad 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.kt @@ -21,5 +21,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt index 8113b02b1c8..51b15e5abc1 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt @@ -31,5 +31,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [KtFirValueParameterSymbol(x)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt index c116e521631..03bcf7f5d45 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt @@ -38,5 +38,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [KtFirTypeParameterSymbol(X)] valueParameters: [KtFirValueParameterSymbol(x)] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.kt index 68573502635..9ab19409cc7 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.kt @@ -21,5 +21,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt index fc252e3b259..2635db091d8 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt @@ -33,7 +33,7 @@ KtFirFunctionSymbol: symbolKind: LOCAL typeParameters: [] valueParameters: [] - visibility: LOCAL + visibility: Local KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -52,7 +52,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: LOCAL typeParameters: [] - visibility: LOCAL + visibility: Local KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -73,5 +73,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.kt index 3317fdda835..a45c144cedb 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.kt @@ -24,7 +24,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -45,7 +45,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -64,5 +64,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt index 04c0166925c..169abc59128 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt @@ -27,7 +27,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirPropertyGetterSymbol: annotatedType: [] kotlin/Int @@ -41,7 +41,7 @@ KtFirPropertyGetterSymbol: modality: FINAL origin: SOURCE symbolKind: TOP_LEVEL - visibility: PUBLIC + visibility: Public KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -65,7 +65,7 @@ KtFirKotlinPropertySymbol: receiverType: [] kotlin/Int setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -84,5 +84,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.kt index 7af8f072c9d..036a311d989 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.kt @@ -22,7 +22,7 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public KtFirFunctionSymbol: annotatedType: [] kotlin/Unit @@ -43,5 +43,5 @@ KtFirFunctionSymbol: symbolKind: TOP_LEVEL typeParameters: [] valueParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt index d664a191afc..4ced066a7a0 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt @@ -25,7 +25,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: TOP_LEVEL - visibility: PUBLIC + visibility: Public KtFirPropertyGetterSymbol: annotatedType: [] kotlin/Int @@ -39,7 +39,7 @@ KtFirPropertyGetterSymbol: modality: FINAL origin: SOURCE symbolKind: TOP_LEVEL - visibility: PUBLIC + visibility: Public KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int @@ -63,5 +63,5 @@ KtFirKotlinPropertySymbol: receiverType: [] kotlin/Int setter: null symbolKind: TOP_LEVEL - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt index d4d72e46c4a..bc61320bb98 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt @@ -33,7 +33,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Annotation] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [kotlin/annotation/Target] @@ -52,7 +52,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Annotation] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [kotlin/annotation/Target] @@ -71,7 +71,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Annotation] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [kotlin/annotation/Target] @@ -90,7 +90,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Annotation] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -109,7 +109,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[] kotlin/Any] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public KtFirValueParameterSymbol: annotatedType: [Anno2()] I @@ -140,7 +140,7 @@ KtFirFunctionSymbol: symbolKind: MEMBER typeParameters: [] valueParameters: [KtFirValueParameterSymbol(arg)] - visibility: PUBLIC + visibility: Public KtFirKotlinPropertySymbol: annotatedType: [Anno4()] I @@ -164,7 +164,7 @@ KtFirKotlinPropertySymbol: receiverType: null setter: null symbolKind: MEMBER - visibility: PUBLIC + visibility: Public KtFirNamedClassOrObjectSymbol: annotationClassIds: [] @@ -183,5 +183,5 @@ KtFirNamedClassOrObjectSymbol: superTypes: [[Anno1()] I] symbolKind: TOP_LEVEL typeParameters: [] - visibility: PUBLIC + visibility: Public */ diff --git a/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt b/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt index dbbd950cf6a..7a8c4cad96f 100644 --- a/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt +++ b/idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt @@ -18,5 +18,5 @@ KtFirConstructorSymbol: symbolKind: MEMBER typeParameters: [KtFirTypeParameterSymbol(E)] valueParameters: [KtFirValueParameterSymbol(c)] - visibility: PUBLIC + visibility: Public */