From 3ebfa8c84abc79a0b1de5151b990944c66f56849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Doln=C3=ADk?= Date: Wed, 17 Apr 2024 16:17:50 +0200 Subject: [PATCH] Fix broken acceptance tests. --- SKIE/acceptance-tests | 2 +- .../kotlin/co/touchlab/skie/sir/NamespaceProvider.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests index 6aecd357..2ebaff02 160000 --- a/SKIE/acceptance-tests +++ b/SKIE/acceptance-tests @@ -1 +1 @@ -Subproject commit 6aecd35798ed12532ed9230b045b0db23aec9744 +Subproject commit 2ebaff02e818597786b818e9c2192dff8f460d16 diff --git a/SKIE/compiler/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/sir/NamespaceProvider.kt b/SKIE/compiler/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/sir/NamespaceProvider.kt index 128f3d4f..7e4d1373 100644 --- a/SKIE/compiler/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/sir/NamespaceProvider.kt +++ b/SKIE/compiler/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/sir/NamespaceProvider.kt @@ -96,9 +96,11 @@ class NamespaceProvider( private val KirModule.moduleNamespaceName: String get() { - val canUseShortName = !this.shortModuleNamespaceNameCollides + val shortModuleNamespaceName = this.shortModuleNamespaceName - return if (canUseShortName) this.shortModuleNamespaceName else this.fullModuleNamespaceName + val canUseShortName = !this.shortModuleNamespaceNameCollides && shortModuleNamespaceName != sirProvider.skieModule.name.toValidSwiftIdentifier() + + return if (canUseShortName) shortModuleNamespaceName else this.fullModuleNamespaceName } private val KirModule.moduleDirectoryName: String