diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt index 636135ec608..908a0dfa169 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt @@ -555,13 +555,10 @@ object Renderers { } private fun renderTypeBounds(typeBounds: TypeBounds, verbosity: ConstraintSystemRenderingVerbosity): String { - val typeVariableName = typeBounds.typeVariable.name.asString() - val renderedTypeVariable = if (verbosity != ConstraintSystemRenderingVerbosity.EXTRA_VERBOSE) - typeVariableName - else - "TypeVariable $typeVariableName, " + - "descriptor = ${typeBounds.typeVariable.freshTypeParameter}, " + - "typeConstructor = ${renderTypeConstructor(typeBounds.typeVariable.freshTypeParameter.typeConstructor)}" + val renderedTypeVariable = renderTypeVariable( + typeBounds.typeVariable, + includeTypeConstructor = verbosity == ConstraintSystemRenderingVerbosity.EXTRA_VERBOSE + ) return if (typeBounds.bounds.isEmpty()) { renderedTypeVariable @@ -577,6 +574,15 @@ object Renderers { } } + private fun renderTypeVariable(typeVariable: TypeVariable, includeTypeConstructor: Boolean): String { + val typeVariableName = typeVariable.name.asString() + if (!includeTypeConstructor) return typeVariableName + + return "TypeVariable $typeVariableName, " + + "descriptor = ${typeVariable.freshTypeParameter}, " + + "typeConstructor = ${renderTypeConstructor(typeVariable.freshTypeParameter.typeConstructor)}" + } + private fun renderTypeBound(bound: Bound, verbosity: ConstraintSystemRenderingVerbosity): String { val typeRendered = if (verbosity == ConstraintSystemRenderingVerbosity.COMPACT) DescriptorRenderer.SHORT_NAMES_IN_TYPES