From b359a5538c8f4af2bf7df6a59a05987197db2e8e Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 13 Apr 2023 14:57:23 +0300
Subject: [PATCH] [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
---
 .../kotlin/fir/serialization/FirElementSerializer.kt       | 6 ++----
 .../kotlin/fir/serialization/FirSerializerExtension.kt     | 7 -------
 .../kotlin/fir/serialization/FirSerializerExtensionBase.kt | 3 ---
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
index 63f6e6f29b2..9341c92d2ee 100644
--- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
+++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
@@ -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()
diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt
index 5bedaa58cb8..7620ea0b9b1 100644
--- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt
+++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt
@@ -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>
-    }
 }
diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtensionBase.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtensionBase.kt
index 2c85ffd0ca7..82664b94a05 100644
--- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtensionBase.kt
+++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtensionBase.kt
@@ -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>,