Minor: extract rendering of type variable into a method

This commit is contained in:
Dmitry Savvinov
2018-04-09 17:50:14 +03:00
parent e450da8b63
commit 8d2f806c6b
@@ -555,13 +555,10 @@ object Renderers {
} }
private fun renderTypeBounds(typeBounds: TypeBounds, verbosity: ConstraintSystemRenderingVerbosity): String { private fun renderTypeBounds(typeBounds: TypeBounds, verbosity: ConstraintSystemRenderingVerbosity): String {
val typeVariableName = typeBounds.typeVariable.name.asString() val renderedTypeVariable = renderTypeVariable(
val renderedTypeVariable = if (verbosity != ConstraintSystemRenderingVerbosity.EXTRA_VERBOSE) typeBounds.typeVariable,
typeVariableName includeTypeConstructor = verbosity == ConstraintSystemRenderingVerbosity.EXTRA_VERBOSE
else )
"TypeVariable $typeVariableName, " +
"descriptor = ${typeBounds.typeVariable.freshTypeParameter}, " +
"typeConstructor = ${renderTypeConstructor(typeBounds.typeVariable.freshTypeParameter.typeConstructor)}"
return if (typeBounds.bounds.isEmpty()) { return if (typeBounds.bounds.isEmpty()) {
renderedTypeVariable 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 { private fun renderTypeBound(bound: Bound, verbosity: ConstraintSystemRenderingVerbosity): String {
val typeRendered = if (verbosity == ConstraintSystemRenderingVerbosity.COMPACT) val typeRendered = if (verbosity == ConstraintSystemRenderingVerbosity.COMPACT)
DescriptorRenderer.SHORT_NAMES_IN_TYPES DescriptorRenderer.SHORT_NAMES_IN_TYPES