diff --git a/.idea/misc.xml b/.idea/misc.xml index 7890c06c1b1..46df63515b4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -87,7 +87,7 @@ - + diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt index d687453e176..a0d1c71de5f 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt @@ -44,6 +44,8 @@ fun JKExpression.type(context: ConversionContext): JKType? = is JKClassAccessExpression -> null is JKJavaNewExpression -> JKClassTypeImpl(classSymbol) is JKJavaInstanceOfExpression -> kotlinTypeByName(KotlinBuiltIns.FQ_NAMES._boolean.asString(), context.symbolProvider) + is JKParenthesizedExpression -> expression.type(context) + is JKTypeCastExpression -> type.type else -> TODO(this::class.java.toString()) } @@ -153,6 +155,7 @@ fun JKType.updateNullability(newNullability: Nullability): JKType = is JKNoType -> this is JKJavaVoidType -> this is JKJavaPrimitiveType -> this + is JKJavaArrayType -> JKJavaArrayTypeImpl(type, newNullability) else -> TODO(this::class.toString()) }