From bd53772f5c0ad2e69ba85944bab39d258b6f5210 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 8 Apr 2019 19:01:12 +0300
Subject: [PATCH] New J2K: Fix explicit NPE cases in conversions

---
 nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt          | 2 +-
 .../kotlin/nj2k/conversions/ImplicitInitializerConversion.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
index 814c2b711b9..a3f5c39aa19 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
@@ -83,7 +83,7 @@ class JKSymbolProvider {
             }
         }
 
-    fun transferSymbol(to: JKDeclaration, from: JKDeclaration) = symbolsByJK[from]!!.let {
+    fun transferSymbol(to: JKDeclaration, from: JKDeclaration) = symbolsByJK[from]?.also {
         it as JKUniverseSymbol<JKTreeElement>
         it.target = to
         symbolsByJK[to] = it
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
index 94071c7ff86..38d99d45a64 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ImplicitInitializerConversion.kt
@@ -53,7 +53,7 @@ class ImplicitInitializerConversion(private val context: ConversionContext) : Re
             .toMap()
 
         fun JKMethodSymbol.parentConstructor(): JKMethodSymbol? =
-            (symbolToConstructor[this]!!.delegationCall as? JKDelegationConstructorCall)
+            (symbolToConstructor[this]?.delegationCall as? JKDelegationConstructorCall)
                 ?.identifier
 
         val constructors = containingClass.declarationList