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

New J2K: Fix type mapper

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-06-16 19:45:42 +03:00
committed by Ilya Kirillov
parent 279c835d04
commit ccb941ab1c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+5 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.j2k.conversions package org.jetbrains.kotlin.j2k.conversions
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.j2k.ConversionContext import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.ast.Nullability import org.jetbrains.kotlin.j2k.ast.Nullability
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
@@ -27,7 +28,10 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
is JKJavaPrimitiveType -> mapPrimitiveType(type, element) is JKJavaPrimitiveType -> mapPrimitiveType(type, element)
is JKClassType -> mapClassType(type, element) is JKClassType -> mapClassType(type, element)
is JKJavaVoidType -> classTypeByFqName( 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 )?.let { JKTypeElementImpl(it) } ?: element
else -> applyRecursive(element, this::applyToElement) else -> applyRecursive(element, this::applyToElement)
} }