From 51a4b81d3e318bef7edf4fd9095c689b04331820 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 4 Apr 2016 12:17:59 +0300 Subject: [PATCH] Minor. Rename AdditionalSupertypes -> AdditionalClassPartsProvider And relevant methods --- .../serialization/builtins/LoadBuiltinsTest.java | 4 ++-- .../load/kotlin/BuiltInClassesAreSerializableOnJvm.kt | 6 +++--- .../load/kotlin/DeserializationComponentsForJava.kt | 2 +- .../src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt | 4 ++-- .../org/jetbrains/kotlin/builtins/KotlinBuiltIns.java | 8 ++++---- .../kotlin/builtins/builtInsPackageFragmentProvider.kt | 4 ++-- ...alSupertypes.kt => AdditionalClassPartsProvider.kt} | 10 +++++----- .../kotlin/serialization/deserialization/context.kt | 2 +- .../descriptors/DeserializedClassDescriptor.kt | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) rename core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/{AdditionalSupertypes.kt => AdditionalClassPartsProvider.kt} (72%) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index cf18f7c972c..7f62d47caa9 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererOptions; import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes; +import org.jetbrains.kotlin.serialization.deserialization.AdditionalClassPartsProvider; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -112,7 +112,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { PackageFragmentProvider packageFragmentProvider = createBuiltInPackageFragmentProvider( storageManager, builtInsModule, BUILT_INS_PACKAGE_FQ_NAMES, new BuiltInFictitiousFunctionClassFactory(storageManager, builtInsModule), - AdditionalSupertypes.None.INSTANCE, + AdditionalClassPartsProvider.None.INSTANCE, new Function1() { @Override public InputStream invoke(String path) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt index 15550bc4610..dd59ca3bec7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.platform.JvmBuiltIns import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.resolve.scopes.MemberScope -import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes +import org.jetbrains.kotlin.serialization.deserialization.AdditionalClassPartsProvider import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor import org.jetbrains.kotlin.types.DelegatingType import org.jetbrains.kotlin.types.KotlinType @@ -37,7 +37,7 @@ import java.io.Serializable class BuiltInClassesAreSerializableOnJvm( private val moduleDescriptor: ModuleDescriptor -) : AdditionalSupertypes { +) : AdditionalClassPartsProvider { private val mockSerializableType = createMockJavaIoSerializableType() @@ -61,7 +61,7 @@ class BuiltInClassesAreSerializableOnJvm( return mockSerializableClass.defaultType } - override fun forClass(classDescriptor: DeserializedClassDescriptor): Collection { + override fun getSupertypes(classDescriptor: DeserializedClassDescriptor): Collection { if (isSerializableInJava(classDescriptor.fqNameSafe)) { return listOf(mockSerializableType) } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt index df186fbd148..6ba8aa20f78 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt @@ -43,7 +43,7 @@ class DeserializationComponentsForJava( storageManager, moduleDescriptor, classDataFinder, annotationAndConstantLoader, packageFragmentProvider, localClassResolver, errorReporter, lookupTracker, FlexibleJavaClassifierTypeFactory, ClassDescriptorFactory.EMPTY, notFoundClasses, JavaTypeCapabilitiesLoader, - additionalSupertypes = BuiltInClassesAreSerializableOnJvm(moduleDescriptor) + additionalClassPartsProvider = BuiltInClassesAreSerializableOnJvm(moduleDescriptor) ) localClassResolver.setDeserializationComponents(components) } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt index 1cd0ae7034c..3817d2936d7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.platform import org.jetbrains.kotlin.builtins.BuiltInsInitializer import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.load.kotlin.BuiltInClassesAreSerializableOnJvm -import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes +import org.jetbrains.kotlin.serialization.deserialization.AdditionalClassPartsProvider class JvmBuiltIns private constructor() : KotlinBuiltIns() { companion object { @@ -32,7 +32,7 @@ class JvmBuiltIns private constructor() : KotlinBuiltIns() { get() = initializer.get() } - override fun getAdditionalSupertypesProvider(): AdditionalSupertypes { + override fun getAdditionalClassPartsProvider(): AdditionalClassPartsProvider { return BuiltInClassesAreSerializableOnJvm(builtInsModule) } } \ No newline at end of file diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 2aded7bbe3a..43fab8aa36a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.MemberScope; -import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes; +import org.jetbrains.kotlin.serialization.deserialization.AdditionalClassPartsProvider; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; @@ -84,7 +84,7 @@ public abstract class KotlinBuiltIns { PackageFragmentProvider packageFragmentProvider = BuiltInsPackageFragmentProviderKt.createBuiltInPackageFragmentProvider( storageManager, builtInsModule, BUILT_INS_PACKAGE_FQ_NAMES, new BuiltInFictitiousFunctionClassFactory(storageManager, builtInsModule), - getAdditionalSupertypesProvider(), + getAdditionalClassPartsProvider(), new Function1() { @Override public InputStream invoke(String path) { @@ -114,8 +114,8 @@ public abstract class KotlinBuiltIns { } @NotNull - protected AdditionalSupertypes getAdditionalSupertypesProvider() { - return AdditionalSupertypes.None.INSTANCE; + protected AdditionalClassPartsProvider getAdditionalClassPartsProvider() { + return AdditionalClassPartsProvider.None.INSTANCE; } private void makePrimitive(@NotNull PrimitiveType primitiveType) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt index 619ddf1371d..abfbfd68f74 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/builtInsPackageFragmentProvider.kt @@ -31,7 +31,7 @@ fun createBuiltInPackageFragmentProvider( module: ModuleDescriptor, packageFqNames: Set, classDescriptorFactory: ClassDescriptorFactory, - additionalSupertypes: AdditionalSupertypes = AdditionalSupertypes.None, + additionalClassPartsProvider: AdditionalClassPartsProvider = AdditionalClassPartsProvider.None, loadResource: (String) -> InputStream? ): PackageFragmentProvider { val packageFragments = packageFqNames.map { fqName -> @@ -54,7 +54,7 @@ fun createBuiltInPackageFragmentProvider( FlexibleTypeFactory.ThrowException, classDescriptorFactory, notFoundClasses, - additionalSupertypes = additionalSupertypes + additionalClassPartsProvider = additionalClassPartsProvider ) localClassResolver.setDeserializationComponents(components) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AdditionalSupertypes.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AdditionalClassPartsProvider.kt similarity index 72% rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AdditionalSupertypes.kt rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AdditionalClassPartsProvider.kt index c311c8c96cf..ca1b9039bc4 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AdditionalSupertypes.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AdditionalClassPartsProvider.kt @@ -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 +interface AdditionalClassPartsProvider { + fun getSupertypes(classDescriptor: DeserializedClassDescriptor): Collection - object None : AdditionalSupertypes { - override fun forClass(classDescriptor: DeserializedClassDescriptor): Collection = emptyList() + object None : AdditionalClassPartsProvider { + override fun getSupertypes(classDescriptor: DeserializedClassDescriptor): Collection = emptyList() } -} \ No newline at end of file +} diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt index 28fb0c5ee6d..79a88d745b4 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt @@ -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) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index 0492f87fc68..5326bba6cd1 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -152,7 +152,7 @@ class DeserializedClassDescriptor( override fun computeSupertypes(): Collection { 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