K2: don't use debugging type renderer in error messages

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt

@@ -129,9 +129,13 @@ object FirDiagnosticRenderers {
     val RENDER_TYPE_WITH_ANNOTATIONS = RENDER_TYPE
 
     val FQ_NAMES_IN_TYPES = Renderer { symbol: FirBasedSymbol<*> ->
+        val idRendererCreator = { ConeIdFullRenderer() }
         @OptIn(SymbolInternals::class)
         FirRenderer(
-            annotationRenderer = null, bodyRenderer = null, idRenderer = ConeIdFullRenderer()
+            annotationRenderer = null,
+            bodyRenderer = null,
+            idRenderer = idRendererCreator(),
+            typeRenderer = ConeTypeRendererWithJavaFlexibleTypes(idRendererCreator)
         ).renderElementAsString(symbol.fir, trim = true)
     }
 

compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt

@@ -15,7 +15,10 @@ class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
 
     private val idRendererCreator: () -> ConeIdRenderer
 
-    @Suppress("ConvertSecondaryConstructorToPrimary")
+    constructor(idRendererCreator: () -> ConeIdRenderer) : super() {
+        this.idRendererCreator = idRendererCreator
+    }
+
     constructor(builder: StringBuilder, idRendererCreator: () -> ConeIdRenderer) : super() {
         this.builder = builder
         this.idRendererCreator = idRendererCreator

compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.fir.kt

@@ -7,5 +7,5 @@ annotation class Ann(val s: String = "")
 fun foo() {}
 
 val bar = foo(
-    <!TOO_MANY_ARGUMENTS("public final fun /foo(): R|kotlin/Unit|")!>15<!>
+    <!TOO_MANY_ARGUMENTS("public final fun /foo(): kotlin/Unit")!>15<!>
 )

compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt

@@ -17,7 +17,7 @@ interface A {
 interface B : A {
     override val p1: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE("p1; @An() val p1: @R|An|()  String")!>Int<!>
     @An
-    override <!VAR_OVERRIDDEN_BY_VAL("public abstract override val /B.p2: R|@R|An|()  kotlin/String|    public get(): R|@R|An|()  kotlin/String|; public abstract var /A.p2: R|@R|An|()  kotlin/String|    public get(): R|@R|An|()  kotlin/String|    public set(value: R|@R|An|()  kotlin/String|): R|kotlin/Unit|")!>val<!> p2: @An String
+    override <!VAR_OVERRIDDEN_BY_VAL("public abstract override val /B.p2: @R|An|()  kotlin/String    public get(): @R|An|()  kotlin/String; public abstract var /A.p2: @R|An|()  kotlin/String    public get(): @R|An|()  kotlin/String    public set(value: @R|An|()  kotlin/String): kotlin/Unit")!>val<!> p2: @An String
     override fun test(arg: String): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("test; @An() fun test(@An() arg: @R|An|()  String): @R|An|()  String")!>Int<!>
 }