From fa8a067c85444d93f30af59ddcb7eebd39a28ce1 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 17 May 2019 14:30:13 +0300
Subject: [PATCH] Fix losing flexible type enhancement in type substituting

It breaks `org.jetbrains.kotlin.nj2k.NewJavaToKotlinConverterSingleFileTestGenerated.ToArray#testToArray` test due to losing external nullability annotations
---
 .../resolve/calls/inference/components/NewTypeSubstitutor.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt
index 15f485e9274..2a378dc6314 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt
@@ -36,7 +36,7 @@ interface NewTypeSubstitutor: TypeSubstitutorMarker {
                     KotlinTypeFactory.flexibleType(
                         lowerBound?.lowerIfFlexible() ?: type.lowerBound,
                         upperBound?.upperIfFlexible() ?: type.upperBound
-                    )
+                    ).inheritEnhancement(type)
                 }
             }
         }