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

[FIR] Rename ConeTypeRendererWithJavaFlexibleTypes to ConeTypeRendererForReadability

Browse Source
This commit is contained in:
Kirill Rakhman
2023-09-12 14:18:09 +02:00
committed by Space Team
parent e996760e7e
commit da0308806a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
+1 -1
View File
@@ -138,7 +138,7 @@ object FirDiagnosticRenderers {
annotationRenderer = null, annotationRenderer = null,
bodyRenderer = null, bodyRenderer = null,
idRenderer = idRendererCreator(), idRenderer = idRendererCreator(),
typeRenderer = ConeTypeRendererWithJavaFlexibleTypes(idRendererCreator) typeRenderer = ConeTypeRendererForReadability(idRendererCreator)
).renderElementAsString(symbol.fir, trim = true) ).renderElementAsString(symbol.fir, trim = true)
} }
compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt → compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
+4 -4
View File
@@ -11,7 +11,7 @@ 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 ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer { class ConeTypeRendererForReadability : ConeTypeRenderer {
private val idRendererCreator: () -> ConeIdRenderer private val idRendererCreator: () -> ConeIdRenderer
@@ -27,9 +27,9 @@ class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
} }
override fun render(flexibleType: ConeFlexibleType) { override fun render(flexibleType: ConeFlexibleType) {
val lowerRenderer = ConeTypeRendererWithJavaFlexibleTypes(StringBuilder(), idRendererCreator) val lowerRenderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
lowerRenderer.render(flexibleType.lowerBound) lowerRenderer.render(flexibleType.lowerBound)
val upperRenderer = ConeTypeRendererWithJavaFlexibleTypes(StringBuilder(), idRendererCreator) val upperRenderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
upperRenderer.render(flexibleType.upperBound) upperRenderer.render(flexibleType.upperBound)
builder.append(renderFlexibleType(lowerRenderer.builder.toString(), upperRenderer.builder.toString())) builder.append(renderFlexibleType(lowerRenderer.builder.toString(), upperRenderer.builder.toString()))
} }
@@ -81,4 +81,4 @@ class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
override fun render(type: ConeIntegerLiteralType) { override fun render(type: ConeIntegerLiteralType) {
render(type.getApproximatedType()) render(type.getApproximatedType())
} }
} }
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
+3 -3
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types
import org.jetbrains.kotlin.fir.renderer.ConeIdRendererForDebugging import org.jetbrains.kotlin.fir.renderer.ConeIdRendererForDebugging
import org.jetbrains.kotlin.fir.renderer.ConeIdShortRenderer import org.jetbrains.kotlin.fir.renderer.ConeIdShortRenderer
import org.jetbrains.kotlin.fir.renderer.ConeTypeRendererForDebugging import org.jetbrains.kotlin.fir.renderer.ConeTypeRendererForDebugging
import org.jetbrains.kotlin.fir.renderer.ConeTypeRendererWithJavaFlexibleTypes import org.jetbrains.kotlin.fir.renderer.ConeTypeRendererForReadability
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
@@ -121,13 +121,13 @@ fun ConeKotlinType.renderForDebugging(): String {
fun ConeKotlinType.renderReadable(): String { fun ConeKotlinType.renderReadable(): String {
val builder = StringBuilder() val builder = StringBuilder()
ConeTypeRendererWithJavaFlexibleTypes(builder) { ConeIdShortRenderer() }.render(this) ConeTypeRendererForReadability(builder) { ConeIdShortRenderer() }.render(this)
return builder.toString() return builder.toString()
} }
fun ConeKotlinType.renderReadableWithFqNames(): String { fun ConeKotlinType.renderReadableWithFqNames(): String {
val builder = StringBuilder() val builder = StringBuilder()
ConeTypeRendererWithJavaFlexibleTypes(builder) { ConeIdRendererForDebugging() }.render(this) ConeTypeRendererForReadability(builder) { ConeIdRendererForDebugging() }.render(this)
return builder.toString() return builder.toString()
} }