azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New J2K: correctly convert Kotlin function type

Browse Source
This commit is contained in:
Ilya Kirillov
2019-06-10 09:53:11 +03:00
parent a2b832e5be
commit b211ae1070
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/TypeMappingConversion.kt
+10 -2
View File
@@ -136,8 +136,10 @@ class TypeMappingConversion(val context: NewJ2kConverterContext) : RecursiveAppl
else toKotlinTypesMap[fqName]
}
private fun JKClassSymbol.kotlinStandardType(): String? =
JavaToKotlinClassMap.mapJavaToKotlin(FqName(fqName))?.asString()
private fun JKClassSymbol.kotlinStandardType(): String? {
if (isKtFunction(fqName)) return fqName
return JavaToKotlinClassMap.mapJavaToKotlin(FqName(fqName))?.asString()
}
private fun JKJavaPrimitiveType.mapPrimitiveType(): JKClassType {
val fqName = jvmPrimitiveType.primitiveType.typeFqName
@@ -156,4 +158,10 @@ class TypeMappingConversion(val context: NewJ2kConverterContext) : RecursiveAppl
else -> false
}
}
companion object {
private val ktFunctionRegex = "kotlin\\.jvm\\.functions\\.Function\\d+".toRegex()
private fun isKtFunction(fqName: String) =
ktFunctionRegex.matches(fqName)
}
}