From 69665e756062a149184f7bf3c2baf42def639d0f Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 7 Sep 2017 16:02:45 +0300
Subject: [PATCH] Minor. Convert function to block body, extract val

---
 .../org/jetbrains/kotlin/load/java/lazy/context.kt  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
index abd15ad56ee..85f78dc7081 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt
@@ -77,11 +77,18 @@ class JavaTypeQualifiersByElementType(
 ) {
     operator fun get(
             applicabilityType: AnnotationTypeQualifierResolver.QualifierApplicabilityType
-    ): JavaTypeQualifiers? =
-        (
+    ): JavaTypeQualifiers? {
+        val nullabilityQualifierWithMigrationStatus =
                 nullabilityQualifiers[applicabilityType]
                 ?: nullabilityQualifiers[AnnotationTypeQualifierResolver.QualifierApplicabilityType.TYPE_USE]
-        )?.let { JavaTypeQualifiers(it.qualifier, null, isNotNullTypeParameter = false, isNullabilityQualifierForWarning = it.isForWarningOnly) }
+                ?: return null
+
+        return JavaTypeQualifiers(
+                nullabilityQualifierWithMigrationStatus.qualifier, null,
+                isNotNullTypeParameter = false,
+                isNullabilityQualifierForWarning = nullabilityQualifierWithMigrationStatus.isForWarningOnly
+        )
+    }
 }
 
 class LazyJavaResolverContext internal constructor(