From cd6bcb787834f87eab995a0235424bb8ec7e8fea Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 18 Dec 2018 14:40:36 +0300
Subject: [PATCH] New J2K: Assume that `is` expression type is always not null

---
 .../kotlin/j2k/conversions/InstanceOfConversion.kt         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InstanceOfConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InstanceOfConversion.kt
index 10587f0b0c0..7132de27fde 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InstanceOfConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InstanceOfConversion.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.j2k.conversions
 
 import com.intellij.psi.PsiClass
+import org.jetbrains.kotlin.j2k.ast.Nullability
 import org.jetbrains.kotlin.j2k.tree.*
 import org.jetbrains.kotlin.j2k.tree.impl.*
 import org.jetbrains.kotlin.psi.KtClass
@@ -14,10 +15,10 @@ import org.jetbrains.kotlin.psi.KtClass
 class InstanceOfConversion : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
         if (element !is JKJavaInstanceOfExpression) return recurse(element)
-        val checkingType = element.type.type
+        val checkingType = element.type.type.updateNullability(Nullability.NotNull)
         val type =
             if (checkingType is JKClassType && checkingType.parameters.isEmpty()) {
-                val resolvedClass = checkingType.classReference?.target
+                val resolvedClass = checkingType.classReference.target
                 val parametersCount =
                     when (resolvedClass) {
                         is PsiClass -> resolvedClass.typeParameters.size
@@ -26,7 +27,7 @@ class InstanceOfConversion : RecursiveApplicableConversionBase() {
                     }
                 val typeParameters = List(parametersCount) { JKStarProjectionTypeImpl() }
                 JKClassTypeImpl(
-                    checkingType.classReference as JKClassSymbol,
+                    checkingType.classReference,
                     typeParameters,
                     checkingType.nullability
                 )