Move function name to hardcoded value

Author: Andrei Shikov

kotlin-plugin/src/main/kotlin/me/shika/ComponentRegistrar.kt

@@ -9,11 +9,9 @@ import org.jetbrains.kotlin.com.intellij.mock.MockProject
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
 
-class ObjectSerializationComponentRegistrar @JvmOverloads constructor(
-    private val enabled: Boolean = false
-): ComponentRegistrar {
+class ObjectSerializationComponentRegistrar(): ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
-        if (configuration[KEY_ENABLED] == false && !enabled) {
+        if (configuration[KEY_ENABLED] == false) {
             return
         }
 

kotlin-plugin/src/main/kotlin/me/shika/generation/ObjectSerializationJvmGeneration.kt

@@ -14,24 +14,22 @@ class ObjectSerializationJvmGeneration : ExpressionCodegenExtension {
         if (codegen.descriptor.needSerializableFix()) {
             val selfType = codegen.typeMapper.mapType(codegen.descriptor)
 
-            codegen.addFunction(SERIALIZABLE_READ.identifier, "()Ljava/lang/Object;") {
+            codegen.addReadResolveFunction {
                 getstatic(codegen.className, "INSTANCE", selfType.descriptor)
                 areturn(selfType)
             }
         }
 
     }
 
-    private fun ImplementationBodyCodegen.addFunction(
-        name: String,
-        asmDescriptor: String,
+    private fun ImplementationBodyCodegen.addReadResolveFunction(
         block: InstructionAdapter.() -> Unit
     ) {
         val visitor = v.newMethod(
             NO_ORIGIN,
             ACC_PUBLIC or ACC_SYNTHETIC,
-            name,
-            asmDescriptor,
+            SERIALIZABLE_READ.identifier,
+            "()Ljava/lang/Object;",
             null,
             EMPTY_STRING_ARRAY
         )

kotlin-plugin/src/main/kotlin/me/shika/generation/utils.kt

@@ -1,6 +1,7 @@
 package me.shika.generation
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.platform.has
@@ -19,7 +20,8 @@ fun ClassDescriptor.needSerializableFix() =
         && !hasReadMethod()
 
 fun ClassDescriptor.hasReadMethod() =
-    unsubstitutedMemberScope.getFunctionNames().contains(SERIALIZABLE_READ)
+    unsubstitutedMemberScope.getContributedFunctions(SERIALIZABLE_READ, NoLookupLocation.FROM_BACKEND)
+        .any { it.name == SERIALIZABLE_READ && it.valueParameters.isEmpty() }
 
 fun ClassDescriptor.isSerializable(): Boolean =
     getSuperInterfaces().any { it.fqNameSafe == SERIALIZABLE_FQ_NAME || it.isSerializable() }

kotlin-plugin/src/test/kotlin/me/shika/ObjectSerializationFixTest.kt

@@ -18,7 +18,7 @@ class ObjectSerializationFixTest(enableIr: Boolean) {
     }
 
     private val compiler = KotlinCompilation().apply {
-        compilerPlugins = listOf(ObjectSerializationComponentRegistrar(enabled = true))
+        compilerPlugins = listOf(ObjectSerializationComponentRegistrar())
         useIR = enableIr
     }