FE10 Analysis API: use compact renderer for flexible types even in debug

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeRenderer.kt

@@ -129,15 +129,6 @@ internal class KtFe10TypeRenderer(private val options: KtTypeRendererOptions, pr
     }
 
     private fun KtFe10RendererConsumer.renderFlexibleType(type: FlexibleType) {
-        if (isDebugText) {
-            append("ft<")
-            renderType(type.lowerBound)
-            append(", ")
-            renderType(type.upperBound)
-            append(">")
-            return
-        }
-
         val lowerBoundText = prettyPrint { renderType(type.lowerBound) }
         val upperBoundText = prettyPrint { renderType(type.upperBound) }
         append(DescriptorRenderer.COMPACT.renderFlexibleType(lowerBoundText, upperBoundText, type.builtIns))

analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt

@@ -6,25 +6,25 @@ KtSuccessCallInfo:
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
-        returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+        returnType = java.util.Comparator<kotlin.Int!>
-        symbol = java/util/Comparator(function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>): java.util.Comparator<T>
+        symbol = java/util/Comparator(function: kotlin.Function2<T!, T!, kotlin.Int>): java.util.Comparator<T>
         valueParameters = [
           KtVariableLikeSignature:
             name = function
             receiverType = null
-            returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+            returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
-            symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+            symbol = function: kotlin.Function2<T!, T!, kotlin.Int>
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = java/util/Comparator
     typeArgumentsMapping = {
-      T -> (ft<kotlin.Int, kotlin.Int?>)
+      T -> (kotlin.Int!)
     }
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
-        returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+        returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
-        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+        symbol = function: kotlin.Function2<T!, T!, kotlin.Int>
         callableIdIfNonLocal = null)
     }

analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt

@@ -6,26 +6,26 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
-        returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+        returnType = java.util.Comparator<kotlin.Int!>
-        symbol = java/util/Comparator(function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>): java.util.Comparator<T>
+        symbol = java/util/Comparator(function: kotlin.Function2<T!, T!, kotlin.Int>): java.util.Comparator<T>
         valueParameters = [
           KtVariableLikeSignature:
             name = function
             receiverType = null
-            returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+            returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
-            symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+            symbol = function: kotlin.Function2<T!, T!, kotlin.Int>
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = java/util/Comparator
     typeArgumentsMapping = {
-      T -> (ft<kotlin.Int, kotlin.Int?>)
+      T -> (kotlin.Int!)
     }
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
-        returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+        returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
-        symbol = function: kotlin.Function2<ft<T, T?>, ft<T, T?>, kotlin.Int>
+        symbol = function: kotlin.Function2<T!, T!, kotlin.Int>
         callableIdIfNonLocal = null)
     }
   isInBestCandidates = true

analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.txt

@@ -14,7 +14,7 @@ KtNamedClassOrObjectSymbol:
   superTypes: [
     kotlin/Any
     java/io/Serializable
-    kotlin/Comparable<ft<kotlin/String, kotlin/String?>>
+    kotlin/Comparable<kotlin/String!>
     kotlin/CharSequence
   ]
   symbolKind: TOP_LEVEL