diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeRenderer.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeRenderer.kt index 0c67d5e1d6c..8a0caf49f8c 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeRenderer.kt +++ b/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)) diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt index 1034f1c0929..5ef5736870f 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.descriptors.txt +++ b/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> - symbol = java/util/Comparator(function: kotlin.Function2, ft, kotlin.Int>): java.util.Comparator + returnType = java.util.Comparator + symbol = java/util/Comparator(function: kotlin.Function2): java.util.Comparator valueParameters = [ KtVariableLikeSignature: name = function receiverType = null - returnType = kotlin.Function2, ft, kotlin.Int> - symbol = function: kotlin.Function2, ft, kotlin.Int> + returnType = kotlin.Function2 + symbol = function: kotlin.Function2 callableIdIfNonLocal = null ] callableIdIfNonLocal = java/util/Comparator typeArgumentsMapping = { - T -> (ft) + T -> (kotlin.Int!) } argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: name = function receiverType = null - returnType = kotlin.Function2, ft, kotlin.Int> - symbol = function: kotlin.Function2, ft, kotlin.Int> + returnType = kotlin.Function2 + symbol = function: kotlin.Function2 callableIdIfNonLocal = null) } \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt index f29be233655..cecba9bf6f5 100644 --- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.descriptors.txt +++ b/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> - symbol = java/util/Comparator(function: kotlin.Function2, ft, kotlin.Int>): java.util.Comparator + returnType = java.util.Comparator + symbol = java/util/Comparator(function: kotlin.Function2): java.util.Comparator valueParameters = [ KtVariableLikeSignature: name = function receiverType = null - returnType = kotlin.Function2, ft, kotlin.Int> - symbol = function: kotlin.Function2, ft, kotlin.Int> + returnType = kotlin.Function2 + symbol = function: kotlin.Function2 callableIdIfNonLocal = null ] callableIdIfNonLocal = java/util/Comparator typeArgumentsMapping = { - T -> (ft) + T -> (kotlin.Int!) } argumentMapping = { {x: Int, y: Int -> 1} -> (KtVariableLikeSignature: name = function receiverType = null - returnType = kotlin.Function2, ft, kotlin.Int> - symbol = function: kotlin.Function2, ft, kotlin.Int> + returnType = kotlin.Function2 + symbol = function: kotlin.Function2 callableIdIfNonLocal = null) } isInBestCandidates = true \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.txt index 9cac7b2a90b..9c370b7af68 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.txt @@ -14,7 +14,7 @@ KtNamedClassOrObjectSymbol: superTypes: [ kotlin/Any java/io/Serializable - kotlin/Comparable> + kotlin/Comparable kotlin/CharSequence ] symbolKind: TOP_LEVEL