From 7c37f3134fc7d16e767eb012b30072f0bc8aea26 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 31 Aug 2018 21:50:07 +0700 Subject: [PATCH] Replace '-' with '_' in Obj-C prefixes (#1985) --- .../kotlin/backend/konan/objcexport/ObjCExportNamer.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt index cae6561a113..51eb53993ba 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt @@ -436,7 +436,10 @@ private fun ObjCExportMapper.canHaveSameName(first: PropertyDescriptor, second: internal val ModuleDescriptor.namePrefix: String get() { // -> FooBar - val moduleName = this.name.asString().let { it.substring(1, it.lastIndex) }.capitalize() + val moduleName = this.name.asString() + .let { it.substring(1, it.lastIndex) } + .capitalize() + .replace('-', '_') val uppers = moduleName.filterIndexed { index, character -> index == 0 || character.isUpperCase() } if (uppers.length >= 3) return uppers