From ccb941ab1c903f54bbe0a3132bef30bad5d1a967 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Sat, 16 Jun 2018 19:45:42 +0300
Subject: [PATCH] New J2K: Fix type mapper

---
 .../kotlin/j2k/conversions/TypeMappingConversion.kt         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
index 44b2caa3025..c05f4da9dbc 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.j2k.conversions
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.j2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Nullability
 import org.jetbrains.kotlin.j2k.tree.*
@@ -27,7 +28,10 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
                 is JKJavaPrimitiveType -> mapPrimitiveType(type, element)
                 is JKClassType -> mapClassType(type, element)
                 is JKJavaVoidType -> classTypeByFqName(
-                    context.backAnnotator(element), ClassId.fromString("kotlin.Unit"), emptyList(), Nullability.NotNull
+                    context.backAnnotator(element),
+                    ClassId.topLevel(KotlinBuiltIns.FQ_NAMES.unit.toSafe()),
+                    emptyList(),
+                    Nullability.NotNull
                 )?.let { JKTypeElementImpl(it) } ?: element
                 else -> applyRecursive(element, this::applyToElement)
             }