diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt index 5fb704e6082..3844c50f599 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt @@ -107,14 +107,14 @@ object JavaToKotlinClassMap { /** * E.g. - * java.lang.String -> kotlin.String - * java.lang.Integer -> kotlin.Int - * kotlin.jvm.internal.IntCompanionObject -> kotlin.Int.Companion - * java.util.List -> kotlin.List - * java.util.Map.Entry -> kotlin.Map.Entry - * java.lang.Void -> null - * kotlin.jvm.functions.Function3 -> kotlin.Function3 - * kotlin.jvm.functions.FunctionN -> null // Without a type annotation like @Arity(n), it's impossible to find out arity + * - java.lang.String -> kotlin.String + * - java.lang.Integer -> kotlin.Int + * - kotlin.jvm.internal.IntCompanionObject -> kotlin.Int.Companion + * - java.util.List -> kotlin.List + * - java.util.Map.Entry -> kotlin.Map.Entry + * - java.lang.Void -> null + * - kotlin.jvm.functions.Function3 -> kotlin.Function3 + * - kotlin.jvm.functions.FunctionN -> null // Without a type annotation like @Arity(n), it's impossible to find out arity */ fun mapJavaToKotlin(fqName: FqName): ClassId? { return javaToKotlin[fqName.toUnsafe()] @@ -127,19 +127,19 @@ object JavaToKotlinClassMap { /** * E.g. - * kotlin.Throwable -> java.lang.Throwable - * kotlin.Int -> java.lang.Integer - * kotlin.Int.Companion -> kotlin.jvm.internal.IntCompanionObject - * kotlin.Nothing -> java.lang.Void - * kotlin.IntArray -> null - * kotlin.Function3 -> kotlin.jvm.functions.Function3 - * kotlin.coroutines.SuspendFunction3 -> kotlin.jvm.functions.Function4 - * kotlin.Function42 -> kotlin.jvm.functions.FunctionN - * kotlin.coroutines.SuspendFunction42 -> kotlin.jvm.functions.FunctionN - * kotlin.reflect.KFunction3 -> kotlin.reflect.KFunction - * kotlin.reflect.KSuspendFunction3 -> kotlin.reflect.KFunction - * kotlin.reflect.KFunction42 -> kotlin.reflect.KFunction - * kotlin.reflect.KSuspendFunction42 -> kotlin.reflect.KFunction + * - kotlin.Throwable -> java.lang.Throwable + * - kotlin.Int -> java.lang.Integer + * - kotlin.Int.Companion -> kotlin.jvm.internal.IntCompanionObject + * - kotlin.Nothing -> java.lang.Void + * - kotlin.IntArray -> null + * - kotlin.Function3 -> kotlin.jvm.functions.Function3 + * - kotlin.coroutines.SuspendFunction3 -> kotlin.jvm.functions.Function4 + * - kotlin.Function42 -> kotlin.jvm.functions.FunctionN + * - kotlin.coroutines.SuspendFunction42 -> kotlin.jvm.functions.FunctionN + * - kotlin.reflect.KFunction3 -> kotlin.reflect.KFunction + * - kotlin.reflect.KSuspendFunction3 -> kotlin.reflect.KFunction + * - kotlin.reflect.KFunction42 -> kotlin.reflect.KFunction + * - kotlin.reflect.KSuspendFunction42 -> kotlin.reflect.KFunction */ fun mapKotlinToJava(kotlinFqName: FqNameUnsafe): ClassId? = when { isKotlinFunctionWithBigArity(kotlinFqName, NUMBERED_FUNCTION_PREFIX) -> FUNCTION_N_CLASS_ID