From 9af8abb8b9bcd74f150cbce47ed78181f0dc9fd9 Mon Sep 17 00:00:00 2001
From: pyos <pyos@google.com>
Date: Tue, 10 Aug 2021 22:22:04 +0200
Subject: [PATCH] FE: slowly refactor extractQualifiersFromAnnotations 1

That code is convoluted, better take it slow to avoid accidentally
breaking (or fixing) anything.
---
 .../typeEnhancement/signatureEnhancement.kt   | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
index c36f6072635..ca38f34675c 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
@@ -273,6 +273,20 @@ private class SignatureParts(
                 composeAnnotations(typeContainer.annotations, typeOrBound.annotations)
             } else typeOrBound.annotations
 
+        val annotationsMutability = annotationTypeQualifierResolver.extractMutability(composedAnnotation)
+        val annotationsNullability = annotationTypeQualifierResolver.extractNullability(composedAnnotation) {
+            (this is LazyJavaAnnotationDescriptor && (isFreshlySupportedTypeUseAnnotation || typeParameterBounds) && !areImprovementsInStrictMode) ||
+                    (this is PossiblyExternalAnnotationDescriptor && isIdeExternalAnnotation)
+        }.takeUnless { type == null }
+
+        if (annotationsNullability != null) {
+            return JavaTypeQualifiers(
+                annotationsNullability.qualifier, annotationsMutability,
+                annotationsNullability.qualifier == NullabilityQualifier.NOT_NULL && typeOrBound.isTypeParameter(),
+                annotationsNullability.isForWarningOnly
+            )
+        }
+
         val defaultTypeQualifier = (
                 if (isHeadTypeConstructor)
                     containerContext.defaultTypeQualifiers?.get(containerApplicabilityType)
@@ -287,27 +301,17 @@ private class SignatureParts(
 
         val (nullabilityFromBoundsForTypeBasedOnTypeParameter, isTypeParameterWithNotNullableBounds) =
             typeOrBound.nullabilityInfoBoundsForTypeParameterUsage()
-
-        val annotationsNullability = annotationTypeQualifierResolver.extractNullability(composedAnnotation) {
-            (this is LazyJavaAnnotationDescriptor && (isFreshlySupportedTypeUseAnnotation || typeParameterBounds) && !areImprovementsInStrictMode) ||
-                    (this is PossiblyExternalAnnotationDescriptor && isIdeExternalAnnotation)
-        }.takeUnless { type == null }
-        val nullabilityInfo =
-            annotationsNullability
-                ?: computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
-                    nullabilityFromBoundsForTypeBasedOnTypeParameter,
-                    defaultTypeQualifier,
-                    typeParameterForArgument
-                )
+        val nullabilityInfo = computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
+            nullabilityFromBoundsForTypeBasedOnTypeParameter,
+            defaultTypeQualifier,
+            typeParameterForArgument
+        )
 
         val isNotNullTypeParameter =
-            if (annotationsNullability != null)
-                annotationsNullability.qualifier == NullabilityQualifier.NOT_NULL
-            else
-                isTypeParameterWithNotNullableBounds || defaultTypeQualifier?.makesTypeParameterNotNull == true
+            isTypeParameterWithNotNullableBounds || defaultTypeQualifier?.makesTypeParameterNotNull == true
 
         return JavaTypeQualifiers(
-            nullabilityInfo?.qualifier, annotationTypeQualifierResolver.extractMutability(composedAnnotation),
+            nullabilityInfo?.qualifier, annotationsMutability,
             isNotNullTypeParameter = isNotNullTypeParameter && typeOrBound.isTypeParameter(),
             isNullabilityQualifierForWarning = nullabilityInfo?.isForWarningOnly == true
         )