From a19ae4bcc235280756ce9cfb1f82ee9a1aab8bfd Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 28 Nov 2018 12:38:14 +0300
Subject: [PATCH] New J2K: Fix accessing to non-existing psi in
 TypeMappingConversion

---
 .../kotlin/j2k/conversions/TypeMappingConversion.kt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
index af62cf71216..8a71d2d0bf8 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
@@ -55,13 +55,12 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
     private fun mapType(type: JKType, element: JKTreeElement): JKType = when (type) {
         is JKJavaPrimitiveType -> mapPrimitiveType(type)
         is JKClassType -> mapClassType(type, element)
-        is JKJavaVoidType -> JKClassTypeImpl(
-            context.symbolProvider.provideByFqName(
-                ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.unit.toSafe()),
-                element.parentOfType<JKClass>()!!.psi!!
-            ),
-            nullability = Nullability.NotNull
-        )
+        is JKJavaVoidType ->
+            kotlinTypeByName(
+                KotlinBuiltIns.FQ_NAMES.unit.toSafe().asString(),
+                context.symbolProvider,
+                Nullability.NotNull
+            )
         is JKJavaArrayType -> JKClassTypeImpl(
             context.symbolProvider.provideByFqName(arrayFqName(type.type)),
             if (type.type is JKJavaPrimitiveType) emptyList() else listOf(mapType(type.type, element)),