[FIR] Render k2-specific flexible types in a more compact way in diagnostic messages

^KT-62031 fixed

compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt

@@ -6,11 +6,13 @@
 package org.jetbrains.kotlin.fir.renderer
 
 import org.jetbrains.kotlin.builtins.StandardNames
+import org.jetbrains.kotlin.fir.types.ConeDefinitelyNotNullType
 import org.jetbrains.kotlin.fir.types.ConeFlexibleType
 import org.jetbrains.kotlin.fir.types.ConeIntegerLiteralType
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.renderer.replacePrefixesInTypeRepresentations
 import org.jetbrains.kotlin.renderer.typeStringsDifferOnlyInNullability
+import org.jetbrains.kotlin.utils.addToStdlib.applyIf
 
 class ConeTypeRendererForReadability(
     private val idRendererCreator: () -> ConeIdRenderer,
@@ -22,14 +24,30 @@ class ConeTypeRendererForReadability(
     }
 
     override fun render(flexibleType: ConeFlexibleType) {
-        val lowerRenderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
-        lowerRenderer.render(flexibleType.lowerBound)
-        val upperRenderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
-        upperRenderer.render(flexibleType.upperBound)
-        builder.append(renderFlexibleType(lowerRenderer.builder.toString(), upperRenderer.builder.toString()))
+        val lower = flexibleType.lowerBound
+
+        val lowerRendered = renderBound(lower)
+        val upperRendered = renderBound(flexibleType.upperBound)
+
+        val rendered =
+            renderFlexibleTypeCompact(lowerRendered, upperRendered)
+                ?: run {
+                    if (lower is ConeDefinitelyNotNullType) {
+                        renderFlexibleTypeCompact(renderBound(lower.original), upperRendered)
+                    } else null
+                }
+                ?: "ft<$lowerRendered, $upperRendered>"
+
+        builder.append(rendered)
     }
 
-    private fun renderFlexibleType(lowerRendered: String, upperRendered: String): String {
+    private fun renderBound(bound: ConeKotlinType): String {
+        val renderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
+        renderer.render(bound)
+        return renderer.builder.toString()
+    }
+
+    private fun renderFlexibleTypeCompact(lowerRendered: String, upperRendered: String): String? {
         if (typeStringsDifferOnlyInNullability(lowerRendered, upperRendered)) {
             if (upperRendered.startsWith("(")) {
                 // the case of complex type, e.g. (() -> Unit)?
@@ -69,8 +87,7 @@ class ConeTypeRendererForReadability(
             foldedPrefix = kotlinPrefix + "Array<(out) "
         )
         if (array != null) return array
-
-        return "ft<$lowerRendered, $upperRendered>"
+        return null
     }
 
     override fun render(type: ConeIntegerLiteralType) {