From 785d741790f653d5c260f59c9d8875bbfde2dc07 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Wed, 12 Aug 2020 14:26:45 +0200 Subject: Fix generic supertypes to hold TypeParameters --- .../src/main/kotlin/converters/KotlinToJavaConverter.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/kotlin-as-java/src/main/kotlin/converters') diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt index e66266a2..58c62622 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt @@ -257,6 +257,7 @@ internal fun String.getAsPrimitive(): JvmPrimitiveType? = org.jetbrains.kotlin.b private fun DRI.partialFqName() = packageName?.let { "$it." } + classNames private fun DRI.possiblyAsJava() = this.partialFqName().mapToJava()?.toDRI(this) ?: this +private fun TypeConstructor.possiblyAsJava() = copy(dri = this.dri.possiblyAsJava()) private fun String.mapToJava(): ClassId? = JavaToKotlinClassMap.mapKotlinToJava(FqName(this).toUnsafe()) @@ -269,9 +270,9 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI( target = PointingToDeclaration ) -internal fun DriWithKind.asJava(): DriWithKind = - DriWithKind( - dri = dri.possiblyAsJava(), +internal fun TypeConstructorWithKind.asJava(): TypeConstructorWithKind = + TypeConstructorWithKind( + typeConstructor = typeConstructor.possiblyAsJava(), kind = kind.asJava() ) -- cgit