Minor. Convert function to block body, extract val

2017-09-07 16:02:45 +03:00
parent bd809c872a
commit 69665e7560
1 changed files with 10 additions and 3 deletions
@@ -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(