From 7ca2df3ff940190727c6d8a19527ba12cec84344 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 29 Jan 2024 09:53:37 +0100 Subject: [PATCH] Kapt: minor, remove unneeded check Most likely it has been made obsolete by KT-27936 where we started to generate all inner class names correctly. #KT-61080 Fixed --- .../jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt index 183929de73a..5576b0105a8 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt @@ -49,7 +49,7 @@ class KaptTreeMaker(context: Context, kaptContext: KaptContextForStubGeneration) @Suppress("FunctionName") fun FqName(internalOrFqName: String): JCTree.JCExpression { - val path = getQualifiedName(internalOrFqName).convertSpecialFqName().split('.') + val path = getQualifiedName(internalOrFqName).split('.') assert(path.isNotEmpty()) return FqName(path) } @@ -141,15 +141,6 @@ class KaptTreeMaker(context: Context, kaptContext: KaptContextForStubGeneration) } } - private fun String.convertSpecialFqName(): String { - // Hard-coded in ImplementationBodyCodegen, KOTLIN_MARKER_INTERFACES - if (this == "kotlin.jvm.internal.markers.KMutableMap\$Entry") { - return replace('$', '.') - } - - return this - } - private fun convertBuiltinType(type: Type): JCTree.JCExpression? { val typeTag = when (type) { BYTE_TYPE -> TypeTag.BYTE @@ -189,4 +180,4 @@ private class DisposableReference(obj: T) : Disposable { override fun dispose() { obj = null } -} \ No newline at end of file +}