From daf1f6154e4154cc1ca515ea2847870bcfff3b66 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 5 Dec 2018 17:07:34 +0300
Subject: [PATCH] New J2K: Add more types to JKExpression.type

---
 .idea/misc.xml                                    | 2 +-
 j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 @@
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="PsiViewerSettings">
-    <option name="splitDividerLocation" value="98" />
+    <option name="splitDividerLocation" value="35" />
   </component>
   <component name="SuppressABINotification">
     <option name="modulesWithSuppressedNotConfigured">
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())
     }