azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Refactor constructors of ConeTypeRenders

Browse Source
This commit is contained in:
Kirill Rakhman
2023-09-12 14:25:36 +02:00
committed by Space Team
parent da0308806a
commit 99b852adf8
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt
+1 -1
View File
@@ -108,7 +108,7 @@ private fun FirTypeRef.renderType(builder: StringBuilder = StringBuilder()): Str
packageDirectiveRenderer = null, packageDirectiveRenderer = null,
propertyAccessorRenderer = null, propertyAccessorRenderer = null,
resolvePhaseRenderer = null, resolvePhaseRenderer = null,
typeRenderer = ConeTypeRenderer().apply { attributeRenderer = EmptyConeTypeAttributeRenderer }, typeRenderer = ConeTypeRenderer(attributeRenderer = EmptyConeTypeAttributeRenderer),
valueParameterRenderer = null, valueParameterRenderer = null,
errorExpressionRenderer = null, errorExpressionRenderer = null,
).renderElementAsString(this) ).renderElementAsString(this)
compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRenderer.kt
+3 -3
View File
@@ -8,11 +8,11 @@ package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind import org.jetbrains.kotlin.builtins.functions.FunctionTypeKind
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
open class ConeTypeRenderer { open class ConeTypeRenderer(
private val attributeRenderer: ConeAttributeRenderer = ConeAttributeRenderer.ToString
) {
lateinit var builder: StringBuilder lateinit var builder: StringBuilder
lateinit var idRenderer: ConeIdRenderer lateinit var idRenderer: ConeIdRenderer
var attributeRenderer: ConeAttributeRenderer = ConeAttributeRenderer.ToString
open fun renderAsPossibleFunctionType( open fun renderAsPossibleFunctionType(
type: ConeKotlinType, type: ConeKotlinType,
compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
+4 -9
View File
@@ -11,17 +11,12 @@ import org.jetbrains.kotlin.fir.types.ConeIntegerLiteralType
import org.jetbrains.kotlin.renderer.replacePrefixesInTypeRepresentations import org.jetbrains.kotlin.renderer.replacePrefixesInTypeRepresentations
import org.jetbrains.kotlin.renderer.typeStringsDifferOnlyInNullability import org.jetbrains.kotlin.renderer.typeStringsDifferOnlyInNullability
class ConeTypeRendererForReadability : ConeTypeRenderer { class ConeTypeRendererForReadability(
private val idRendererCreator: () -> ConeIdRenderer,
) : ConeTypeRenderer() {
private val idRendererCreator: () -> ConeIdRenderer constructor(builder: StringBuilder, idRendererCreator: () -> ConeIdRenderer) : this(idRendererCreator) {
constructor(idRendererCreator: () -> ConeIdRenderer) : super() {
this.idRendererCreator = idRendererCreator
}
constructor(builder: StringBuilder, idRendererCreator: () -> ConeIdRenderer) : super() {
this.builder = builder this.builder = builder
this.idRendererCreator = idRendererCreator
this.idRenderer = idRendererCreator() this.idRenderer = idRendererCreator()
idRenderer.builder = builder idRenderer.builder = builder
} }