[FIR] Get rid of FirSerializerExtension.customClassMembersProducer

This service was needed in FE 1.0 because of different scope structure
  for Java classes, but seems like it has no sense for FIR
This commit is contained in:
Dmitriy Novozhilov
2023-04-13 14:57:23 +03:00
committed by Space Team
parent cf6a06fd14
commit b359a5538c
3 changed files with 2 additions and 14 deletions
@@ -170,10 +170,8 @@ class FirElementSerializer private constructor(
}
}
val callableMembers =
extension.customClassMembersProducer?.getCallableMembers(klass)
?: (klass.memberDeclarations() + providedDeclarationsService.getProvidedCallables(classSymbol, scopeSession))
.sortedWith(FirCallableDeclarationComparator)
val callableMembers = (klass.memberDeclarations() + providedDeclarationsService.getProvidedCallables(classSymbol, scopeSession))
.sortedWith(FirCallableDeclarationComparator)
for (declaration in callableMembers) {
if (declaration !is FirEnumEntry && declaration.isStatic) continue // ??? Miss values() & valueOf()
@@ -99,11 +99,4 @@ abstract class FirSerializerExtension {
open fun serializeErrorType(type: ConeErrorType, builder: ProtoBuf.Type.Builder) {
throw IllegalStateException("Cannot serialize error type: $type")
}
open val customClassMembersProducer: ClassMembersProducer?
get() = null
interface ClassMembersProducer {
fun getCallableMembers(klass: FirClass): Collection<FirCallableDeclaration>
}
}
@@ -100,9 +100,6 @@ abstract class FirSerializerExtensionBase(
typeParameter.serializeAnnotations(proto, protocol.typeParameterAnnotation)
}
override val customClassMembersProducer: ClassMembersProducer?
get() = super.customClassMembersProducer
@Suppress("Reformat")
private fun <
MessageType : GeneratedMessageLite.ExtendableMessage<MessageType>,