azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Rename AdditionalSupertypes -> AdditionalClassPartsProvider

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt
+3 -3
View File
@@ -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<KotlinType> {
override fun getSupertypes(classDescriptor: DeserializedClassDescriptor): Collection<KotlinType> {
if (isSerializableInJava(classDescriptor.fqNameSafe)) {
return listOf(mockSerializableType)
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt
+1 -1
View File
@@ -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)
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt
+2 -2
View File
@@ -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)
}
}