diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt index 18e3a04564d..da0e4338ac5 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt @@ -108,7 +108,7 @@ private fun FirTypeRef.renderType(builder: StringBuilder = StringBuilder()): Str packageDirectiveRenderer = null, propertyAccessorRenderer = null, resolvePhaseRenderer = null, - typeRenderer = ConeTypeRenderer().apply { attributeRenderer = EmptyConeTypeAttributeRenderer }, + typeRenderer = ConeTypeRenderer(attributeRenderer = EmptyConeTypeAttributeRenderer), valueParameterRenderer = null, errorExpressionRenderer = null, ).renderElementAsString(this) diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRenderer.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRenderer.kt index bc70cd5e3ac..97c2300d086 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRenderer.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRenderer.kt @@ -8,11 +8,11 @@ package org.jetbrains.kotlin.fir.renderer import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind import org.jetbrains.kotlin.fir.types.* -open class ConeTypeRenderer { - +open class ConeTypeRenderer( + private val attributeRenderer: ConeAttributeRenderer = ConeAttributeRenderer.ToString +) { lateinit var builder: StringBuilder lateinit var idRenderer: ConeIdRenderer - var attributeRenderer: ConeAttributeRenderer = ConeAttributeRenderer.ToString open fun renderAsPossibleFunctionType( type: ConeKotlinType, diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt index bda15c897b0..3189cfd3a99 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt @@ -11,17 +11,12 @@ import org.jetbrains.kotlin.fir.types.ConeIntegerLiteralType import org.jetbrains.kotlin.renderer.replacePrefixesInTypeRepresentations import org.jetbrains.kotlin.renderer.typeStringsDifferOnlyInNullability -class ConeTypeRendererForReadability : ConeTypeRenderer { +class ConeTypeRendererForReadability( + private val idRendererCreator: () -> ConeIdRenderer, +) : ConeTypeRenderer() { - private val idRendererCreator: () -> ConeIdRenderer - - constructor(idRendererCreator: () -> ConeIdRenderer) : super() { - this.idRendererCreator = idRendererCreator - } - - constructor(builder: StringBuilder, idRendererCreator: () -> ConeIdRenderer) : super() { + constructor(builder: StringBuilder, idRendererCreator: () -> ConeIdRenderer) : this(idRendererCreator) { this.builder = builder - this.idRendererCreator = idRendererCreator this.idRenderer = idRendererCreator() idRenderer.builder = builder }