From 0489efc0ae88d3e8d4046e0152aae0fd6f334e82 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 16 Nov 2018 17:34:21 +0300
Subject: [PATCH] Get rid of !! in getDataFlowAwareTypes #KT-28200 Fixed

---
 .../quickfix/createFromUsage/callableBuilder/typeUtils.kt    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
index 7c21f1c4602..25ca6b3e9ee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
@@ -349,10 +349,9 @@ fun getDataFlowAwareTypes(
     if (originalType == null) return emptyList()
     val dataFlowInfo = bindingContext.getDataFlowInfoAfter(expression)
     val dataFlowValueFactory = expression.getResolutionFacade().frontendService<DataFlowValueFactory>()
+    val expressionType = bindingContext.getType(expression) ?: return listOf(originalType)
     val dataFlowValue = dataFlowValueFactory.createDataFlowValue(
-            expression,
-            bindingContext.getType(expression)!!,
-            bindingContext, expression.getResolutionFacade().moduleDescriptor
+        expression, expressionType, bindingContext, expression.getResolutionFacade().moduleDescriptor
     )
     return dataFlowInfo.getCollectedTypes(dataFlowValue, expression.languageVersionSettings).ifEmpty { listOf(originalType) }
 }
\ No newline at end of file