Minor. Rename AdditionalSupertypes -> AdditionalClassPartsProvider
And relevant methods
This commit is contained in:
+5
-5
@@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -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)
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user