From da0308806aee0cbd5340723c9f9d54cd4be7e692 Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@jetbrains.com>
Date: Tue, 12 Sep 2023 14:18:09 +0200
Subject: [PATCH] [FIR] Rename ConeTypeRendererWithJavaFlexibleTypes to
 ConeTypeRendererForReadability

---
 .../fir/analysis/diagnostics/FirDiagnosticRenderers.kt    | 2 +-
 ...FlexibleTypes.kt => ConeTypeRendererForReadability.kt} | 8 ++++----
 .../src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/{ConeTypeRendererWithJavaFlexibleTypes.kt => ConeTypeRendererForReadability.kt} (92%)

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
index 331cc8cfeeb..ac049ee806e 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
@@ -138,7 +138,7 @@ object FirDiagnosticRenderers {
             annotationRenderer = null,
             bodyRenderer = null,
             idRenderer = idRendererCreator(),
-            typeRenderer = ConeTypeRendererWithJavaFlexibleTypes(idRendererCreator)
+            typeRenderer = ConeTypeRendererForReadability(idRendererCreator)
         ).renderElementAsString(symbol.fir, trim = true)
     }
 
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
similarity index 92%
rename from compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt
rename to compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
index 64eafe2b6ba..bda15c897b0 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.types.ConeIntegerLiteralType
 import org.jetbrains.kotlin.renderer.replacePrefixesInTypeRepresentations
 import org.jetbrains.kotlin.renderer.typeStringsDifferOnlyInNullability
 
-class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
+class ConeTypeRendererForReadability : ConeTypeRenderer {
 
     private val idRendererCreator: () -> ConeIdRenderer
 
@@ -27,9 +27,9 @@ class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
     }
 
     override fun render(flexibleType: ConeFlexibleType) {
-        val lowerRenderer = ConeTypeRendererWithJavaFlexibleTypes(StringBuilder(), idRendererCreator)
+        val lowerRenderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
         lowerRenderer.render(flexibleType.lowerBound)
-        val upperRenderer = ConeTypeRendererWithJavaFlexibleTypes(StringBuilder(), idRendererCreator)
+        val upperRenderer = ConeTypeRendererForReadability(StringBuilder(), idRendererCreator)
         upperRenderer.render(flexibleType.upperBound)
         builder.append(renderFlexibleType(lowerRenderer.builder.toString(), upperRenderer.builder.toString()))
     }
@@ -81,4 +81,4 @@ class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
     override fun render(type: ConeIntegerLiteralType) {
         render(type.getApproximatedType())
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
index 88a1b4a5a45..a5dd38b057b 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types
 import org.jetbrains.kotlin.fir.renderer.ConeIdRendererForDebugging
 import org.jetbrains.kotlin.fir.renderer.ConeIdShortRenderer
 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.name.ClassId
 import org.jetbrains.kotlin.types.Variance
@@ -121,13 +121,13 @@ fun ConeKotlinType.renderForDebugging(): String {
 
 fun ConeKotlinType.renderReadable(): String {
     val builder = StringBuilder()
-    ConeTypeRendererWithJavaFlexibleTypes(builder) { ConeIdShortRenderer() }.render(this)
+    ConeTypeRendererForReadability(builder) { ConeIdShortRenderer() }.render(this)
     return builder.toString()
 }
 
 fun ConeKotlinType.renderReadableWithFqNames(): String {
     val builder = StringBuilder()
-    ConeTypeRendererWithJavaFlexibleTypes(builder) { ConeIdRendererForDebugging() }.render(this)
+    ConeTypeRendererForReadability(builder) { ConeIdRendererForDebugging() }.render(this)
     return builder.toString()
 }