Fix broken acceptance tests.

touchlab · Apr 17, 2024 · 3ebfa8c · 3ebfa8c
1 parent 32caa74
commit 3ebfa8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/...mpiler/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/sir/NamespaceProvider.kt b/...mpiler/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