Minor. Rename AdditionalSupertypes -> AdditionalClassPartsProvider

And relevant methods
This commit is contained in:
Denis Zharkov
2016-04-04 12:17:59 +03:00
parent c918b3e1ae
commit 51a4b81d3e
9 changed files with 21 additions and 21 deletions
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.types.KotlinType
interface AdditionalSupertypes {
fun forClass(classDescriptor: DeserializedClassDescriptor): Collection<KotlinType>
interface AdditionalClassPartsProvider {
fun getSupertypes(classDescriptor: DeserializedClassDescriptor): Collection<KotlinType>
object None : AdditionalSupertypes {
override fun forClass(classDescriptor: DeserializedClassDescriptor): Collection<KotlinType> = emptyList()
object None : AdditionalClassPartsProvider {
override fun getSupertypes(classDescriptor: DeserializedClassDescriptor): Collection<KotlinType> = emptyList()
}
}
}
@@ -39,7 +39,7 @@ class DeserializationComponents(
val fictitiousClassDescriptorFactory: ClassDescriptorFactory,
val notFoundClasses: NotFoundClasses,
val typeCapabilitiesLoader: TypeCapabilitiesLoader = TypeCapabilitiesLoader.NONE,
val additionalSupertypes: AdditionalSupertypes = AdditionalSupertypes.None
val additionalClassPartsProvider: AdditionalClassPartsProvider = AdditionalClassPartsProvider.None
) {
val classDeserializer: ClassDeserializer = ClassDeserializer(this)
@@ -152,7 +152,7 @@ class DeserializedClassDescriptor(
override fun computeSupertypes(): Collection<KotlinType> {
val result = classProto.supertypes(c.typeTable).map { supertypeProto ->
c.typeDeserializer.type(supertypeProto)
} + c.components.additionalSupertypes.forClass(this@DeserializedClassDescriptor)
} + c.components.additionalClassPartsProvider.getSupertypes(this@DeserializedClassDescriptor)
val unresolved = result.mapNotNull { supertype ->
supertype.constructor.declarationDescriptor as? NotFoundClasses.MockClassDescriptor