Rename Visibility to DescriptorVisibility

2020-09-01 16:06:06 +03:00
parent 2bcd8ee07f
commit d1fd1da56f
379 changed files with 2240 additions and 2250 deletions
@@ -172,15 +172,15 @@ class MemberDeserializer(private val c: DeserializationContext) {
    }

    private fun DeserializedSimpleFunctionDescriptor.initializeWithCoroutinesExperimentalityStatus(
-        extensionReceiverParameter: ReceiverParameterDescriptor?,
-        dispatchReceiverParameter: ReceiverParameterDescriptor?,
-        typeParameters: List<TypeParameterDescriptor>,
-        unsubstitutedValueParameters: List<ValueParameterDescriptor>,
-        unsubstitutedReturnType: KotlinType?,
-        modality: Modality?,
-        visibility: Visibility,
-        userDataMap: Map<out CallableDescriptor.UserDataKey<*>, *>,
-        isSuspend: Boolean
+            extensionReceiverParameter: ReceiverParameterDescriptor?,
+            dispatchReceiverParameter: ReceiverParameterDescriptor?,
+            typeParameters: List<TypeParameterDescriptor>,
+            unsubstitutedValueParameters: List<ValueParameterDescriptor>,
+            unsubstitutedReturnType: KotlinType?,
+            modality: Modality?,
+            visibility: DescriptorVisibility,
+            userDataMap: Map<out CallableDescriptor.UserDataKey<*>, *>,
+            isSuspend: Boolean
    ) {
        initialize(
            extensionReceiverParameter,
@@ -53,22 +53,22 @@ object ProtoEnumFlags {
    }

    fun visibility(visibility: ProtoBuf.Visibility?) = when (visibility) {
-        ProtoBuf.Visibility.INTERNAL -> Visibilities.INTERNAL
-        ProtoBuf.Visibility.PRIVATE -> Visibilities.PRIVATE
-        ProtoBuf.Visibility.PRIVATE_TO_THIS -> Visibilities.PRIVATE_TO_THIS
-        ProtoBuf.Visibility.PROTECTED -> Visibilities.PROTECTED
-        ProtoBuf.Visibility.PUBLIC -> Visibilities.PUBLIC
-        ProtoBuf.Visibility.LOCAL -> Visibilities.LOCAL
-        else -> Visibilities.PRIVATE
+        ProtoBuf.Visibility.INTERNAL -> DescriptorVisibilities.INTERNAL
+        ProtoBuf.Visibility.PRIVATE -> DescriptorVisibilities.PRIVATE
+        ProtoBuf.Visibility.PRIVATE_TO_THIS -> DescriptorVisibilities.PRIVATE_TO_THIS
+        ProtoBuf.Visibility.PROTECTED -> DescriptorVisibilities.PROTECTED
+        ProtoBuf.Visibility.PUBLIC -> DescriptorVisibilities.PUBLIC
+        ProtoBuf.Visibility.LOCAL -> DescriptorVisibilities.LOCAL
+        else -> DescriptorVisibilities.PRIVATE
    }

-    fun visibility(visibility: Visibility): ProtoBuf.Visibility = when (visibility) {
-        Visibilities.INTERNAL -> ProtoBuf.Visibility.INTERNAL
-        Visibilities.PUBLIC -> ProtoBuf.Visibility.PUBLIC
-        Visibilities.PRIVATE -> ProtoBuf.Visibility.PRIVATE
-        Visibilities.PRIVATE_TO_THIS -> ProtoBuf.Visibility.PRIVATE_TO_THIS
-        Visibilities.PROTECTED -> ProtoBuf.Visibility.PROTECTED
-        Visibilities.LOCAL -> ProtoBuf.Visibility.LOCAL
+    fun visibility(visibility: DescriptorVisibility): ProtoBuf.Visibility = when (visibility) {
+        DescriptorVisibilities.INTERNAL -> ProtoBuf.Visibility.INTERNAL
+        DescriptorVisibilities.PUBLIC -> ProtoBuf.Visibility.PUBLIC
+        DescriptorVisibilities.PRIVATE -> ProtoBuf.Visibility.PRIVATE
+        DescriptorVisibilities.PRIVATE_TO_THIS -> ProtoBuf.Visibility.PRIVATE_TO_THIS
+        DescriptorVisibilities.PROTECTED -> ProtoBuf.Visibility.PROTECTED
+        DescriptorVisibilities.LOCAL -> ProtoBuf.Visibility.LOCAL
        else -> throw IllegalArgumentException("Unknown visibility: $visibility")
    }

@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.*
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.types.*

@@ -69,15 +68,15 @@ class DeserializedSimpleFunctionDescriptor(
        private set

    fun initialize(
-        extensionReceiverParameter: ReceiverParameterDescriptor?,
-        dispatchReceiverParameter: ReceiverParameterDescriptor?,
-        typeParameters: List<TypeParameterDescriptor>,
-        unsubstitutedValueParameters: List<ValueParameterDescriptor>,
-        unsubstitutedReturnType: KotlinType?,
-        modality: Modality?,
-        visibility: Visibility,
-        userDataMap: Map<out CallableDescriptor.UserDataKey<*>, *>,
-        isExperimentalCoroutineInReleaseEnvironment: DeserializedMemberDescriptor.CoroutinesCompatibilityMode
+            extensionReceiverParameter: ReceiverParameterDescriptor?,
+            dispatchReceiverParameter: ReceiverParameterDescriptor?,
+            typeParameters: List<TypeParameterDescriptor>,
+            unsubstitutedValueParameters: List<ValueParameterDescriptor>,
+            unsubstitutedReturnType: KotlinType?,
+            modality: Modality?,
+            visibility: DescriptorVisibility,
+            userDataMap: Map<out CallableDescriptor.UserDataKey<*>, *>,
+            isExperimentalCoroutineInReleaseEnvironment: DeserializedMemberDescriptor.CoroutinesCompatibilityMode
    ): SimpleFunctionDescriptorImpl {
        return super.initialize(
            extensionReceiverParameter,
@@ -112,24 +111,24 @@ class DeserializedSimpleFunctionDescriptor(
 }

 class DeserializedPropertyDescriptor(
-    containingDeclaration: DeclarationDescriptor,
-    original: PropertyDescriptor?,
-    annotations: Annotations,
-    modality: Modality,
-    visibility: Visibility,
-    isVar: Boolean,
-    name: Name,
-    kind: CallableMemberDescriptor.Kind,
-    isLateInit: Boolean,
-    isConst: Boolean,
-    isExternal: Boolean,
-    isDelegated: Boolean,
-    isExpect: Boolean,
-    override val proto: ProtoBuf.Property,
-    override val nameResolver: NameResolver,
-    override val typeTable: TypeTable,
-    override val versionRequirementTable: VersionRequirementTable,
-    override val containerSource: DeserializedContainerSource?
+        containingDeclaration: DeclarationDescriptor,
+        original: PropertyDescriptor?,
+        annotations: Annotations,
+        modality: Modality,
+        visibility: DescriptorVisibility,
+        isVar: Boolean,
+        name: Name,
+        kind: CallableMemberDescriptor.Kind,
+        isLateInit: Boolean,
+        isConst: Boolean,
+        isExternal: Boolean,
+        isDelegated: Boolean,
+        isExpect: Boolean,
+        override val proto: ProtoBuf.Property,
+        override val nameResolver: NameResolver,
+        override val typeTable: TypeTable,
+        override val versionRequirementTable: VersionRequirementTable,
+        override val containerSource: DeserializedContainerSource?
 ) : DeserializedCallableMemberDescriptor, PropertyDescriptorImpl(
    containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE,
    isLateInit, isConst, isExpect, false, isExternal, isDelegated
@@ -149,13 +148,13 @@ class DeserializedPropertyDescriptor(
    }

    override fun createSubstitutedCopy(
-        newOwner: DeclarationDescriptor,
-        newModality: Modality,
-        newVisibility: Visibility,
-        original: PropertyDescriptor?,
-        kind: CallableMemberDescriptor.Kind,
-        newName: Name,
-        source: SourceElement
+            newOwner: DeclarationDescriptor,
+            newModality: Modality,
+            newVisibility: DescriptorVisibility,
+            original: PropertyDescriptor?,
+            kind: CallableMemberDescriptor.Kind,
+            newName: Name,
+            source: SourceElement
    ): PropertyDescriptorImpl {
        return DeserializedPropertyDescriptor(
            newOwner, original, annotations, newModality, newVisibility, isVar, newName, kind, isLateInit, isConst, isExternal,
@@ -211,16 +210,16 @@ class DeserializedClassConstructorDescriptor(
 }

 class DeserializedTypeAliasDescriptor(
-    override val storageManager: StorageManager,
-    containingDeclaration: DeclarationDescriptor,
-    annotations: Annotations,
-    name: Name,
-    visibility: Visibility,
-    override val proto: ProtoBuf.TypeAlias,
-    override val nameResolver: NameResolver,
-    override val typeTable: TypeTable,
-    override val versionRequirementTable: VersionRequirementTable,
-    override val containerSource: DeserializedContainerSource?
+        override val storageManager: StorageManager,
+        containingDeclaration: DeclarationDescriptor,
+        annotations: Annotations,
+        name: Name,
+        visibility: DescriptorVisibility,
+        override val proto: ProtoBuf.TypeAlias,
+        override val nameResolver: NameResolver,
+        override val typeTable: TypeTable,
+        override val versionRequirementTable: VersionRequirementTable,
+        override val containerSource: DeserializedContainerSource?
 ) : AbstractTypeAliasDescriptor(containingDeclaration, annotations, name, SourceElement.NO_SOURCE, visibility),
    DeserializedMemberDescriptor {
    override lateinit var constructors: Collection<TypeAliasConstructorDescriptor> private set