From c95a3f47f1c16102709b9e0c21e716cd144eca37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Doln=C3=ADk?= Date: Wed, 17 Apr 2024 11:28:33 +0200 Subject: [PATCH] Temporarily disable support for correct toString and hashCode because it needs custom header generation. --- SKIE/acceptance-tests | 2 +- .../co/touchlab/skie/configuration/SkieConfigurationFlag.kt | 1 - .../phases/kir/CreateKirDescriptionAndHashPropertyPhase.kt | 5 ++++- .../skie/phases/kir/CreateKirSimpleFunctionsPhase.kt | 4 +++- .../skie/plugin/configuration/SkieMigrationConfiguration.kt | 3 +-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests index 47fa6d0c..ec4d4ef3 160000 --- a/SKIE/acceptance-tests +++ b/SKIE/acceptance-tests @@ -1 +1 @@ -Subproject commit 47fa6d0cda93bfa4af88992dbab4a8aaec23c3a1 +Subproject commit ec4d4ef36aadf4675308056cf67535e8823e3ea9 diff --git a/SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/SkieConfigurationFlag.kt b/SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/SkieConfigurationFlag.kt index 8332963f..bd17888f 100644 --- a/SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/SkieConfigurationFlag.kt +++ b/SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/SkieConfigurationFlag.kt @@ -13,7 +13,6 @@ enum class SkieConfigurationFlag { Build_ConcurrentSkieCompilation, Migration_WildcardExport, - // TODO Add tests once we implement custom header generation Migration_AnyMethodsAsFunctions, Debug_VerifyDescriptorProviderConsistency, diff --git a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirDescriptionAndHashPropertyPhase.kt b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirDescriptionAndHashPropertyPhase.kt index 0edcadc1..88306019 100644 --- a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirDescriptionAndHashPropertyPhase.kt +++ b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirDescriptionAndHashPropertyPhase.kt @@ -28,7 +28,10 @@ internal class CreateKirDescriptionAndHashPropertyPhase( context(KirPhase.Context) override fun isActive(): Boolean = - SkieConfigurationFlag.Migration_AnyMethodsAsFunctions.isDisabled + // WIP Change back once we generate custom header + // WIP Add tests for this flag and functionality + false +// SkieConfigurationFlag.Migration_AnyMethodsAsFunctions.isDisabled private val cache = mutableMapOf() diff --git a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirSimpleFunctionsPhase.kt b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirSimpleFunctionsPhase.kt index 489eaf13..1c69228f 100644 --- a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirSimpleFunctionsPhase.kt +++ b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/kir/CreateKirSimpleFunctionsPhase.kt @@ -24,7 +24,9 @@ internal class CreateKirSimpleFunctionsPhase( private val convertedPropertyKindLazyInitializers = mutableListOf<() -> Unit>() - private val needsDescriptionAndHashFunctions = SkieConfigurationFlag.Migration_AnyMethodsAsFunctions in context.rootConfiguration.enabledFlags + // WIP Change back once we generate custom header +// private val needsDescriptionAndHashFunctions = SkieConfigurationFlag.Migration_AnyMethodsAsFunctions in context.rootConfiguration.enabledFlags + private val needsDescriptionAndHashFunctions = true context(KirCompilerPhase.Context) override suspend fun execute() { diff --git a/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt index d9d12dcb..4cada604 100644 --- a/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt +++ b/SKIE/skie-gradle/plugin/src/main/kotlin/co/touchlab/skie/plugin/configuration/SkieMigrationConfiguration.kt @@ -23,8 +23,7 @@ abstract class SkieMigrationConfiguration @Inject constructor(objects: ObjectFac * SKIE corrects this behavior and always exports `toString()` as `description` and `hashCode()` as `hash`. * To enable the original behavior, set this flag to `true`. */ - // TODO Set this to false once we generate custom headers - val anyMethodsAsFunctions: Property = objects.property(Boolean::class.java).convention(true) + val anyMethodsAsFunctions: Property = objects.property(Boolean::class.java).convention(false) internal fun buildConfigurationFlags(): Set = setOfNotNull(