From 55b4de56d8b7a3f962947582a08771d4dfa447f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Dolni=CC=81k?= Date: Thu, 2 Nov 2023 11:36:08 +0100 Subject: [PATCH] Merge all Kotlin internal type aliases from each module to a single file. --- .../kotlin/co/touchlab/skie/sir/SkieNamespaceProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/SkieNamespaceProvider.kt b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/SkieNamespaceProvider.kt index a38306e6e..cb73c04a7 100644 --- a/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/SkieNamespaceProvider.kt +++ b/SKIE/compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/sir/SkieNamespaceProvider.kt @@ -51,15 +51,15 @@ class SkieNamespaceProvider( fun getFile(swiftModel: KotlinTypeSwiftModel): SirFile = sirProvider.getFile(swiftModel.skieNamespaceName, swiftModel.skieFileName) - private fun getFile(classDescriptor: ClassDescriptor): SirFile = - sirProvider.getFile(classDescriptor.skieNamespaceName, classDescriptor.skieFileName) + private fun getNamespaceFile(classDescriptor: ClassDescriptor): SirFile = + sirProvider.getFile(classDescriptor.skieNamespaceName, "Skie") fun getOrCreateNamespace(classDescriptor: ClassDescriptor): SirClass = classNamespaceCache.getOrPut(classDescriptor) { val parent = if (classDescriptor in descriptorProvider.exposedClasses) { SirExtension( classDeclaration = getNamespaceParent(classDescriptor), - parent = getFile(classDescriptor), + parent = getNamespaceFile(classDescriptor), ) } else { getNamespaceParent(classDescriptor)