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

Exclude private typealiases from ABI classes

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-11-30 21:25:44 +03:00
parent 1f5ca7274d
commit 3a29b337a0
6 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+5 -3
View File
@@ -116,7 +116,7 @@ class DescriptorSerializer private constructor(
val nestedClassifiers = sort(DescriptorUtils.getAllDescriptors(classDescriptor.unsubstitutedInnerClassesScope))
for (descriptor in nestedClassifiers) {
if (descriptor is TypeAliasDescriptor) {
builder.addTypeAlias(typeAliasProto(descriptor))
typeAliasProto(descriptor)?.let { builder.addTypeAlias(it) }
}
else {
val name = getSimpleNameIndex(descriptor.name)
@@ -406,7 +406,9 @@ class DescriptorSerializer private constructor(
)
}
private fun typeAliasProto(descriptor: TypeAliasDescriptor): ProtoBuf.TypeAlias.Builder {
private fun typeAliasProto(descriptor: TypeAliasDescriptor): ProtoBuf.TypeAlias.Builder? {
if (!extension.shouldSerializeTypeAlias(descriptor)) return null
val builder = ProtoBuf.TypeAlias.newBuilder()
val local = createChildSerializer(descriptor)
@@ -644,7 +646,7 @@ class DescriptorSerializer private constructor(
when (declaration) {
is PropertyDescriptor -> propertyProto(declaration)?.let { builder.addProperty(it) }
is FunctionDescriptor -> functionProto(declaration)?.let { builder.addFunction(it) }
is TypeAliasDescriptor -> builder.addTypeAlias(typeAliasProto(declaration))
is TypeAliasDescriptor -> typeAliasProto(declaration)?.let { builder.addTypeAlias(it) }
}
}
compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.kt
+1
View File
@@ -24,6 +24,7 @@ abstract class SerializerExtension {
open fun shouldUseNormalizedVisibility(): Boolean = false
open fun shouldSerializeFunction(descriptor: FunctionDescriptor): Boolean = true
open fun shouldSerializeProperty(descriptor: PropertyDescriptor): Boolean = true
open fun shouldSerializeTypeAlias(descriptor: TypeAliasDescriptor): Boolean = true
interface ClassMembersProducer {
fun getCallableMembers(classDescriptor: ClassDescriptor): Collection<CallableMemberDescriptor>