[FE 1.0] Move diagnostic parameter renderers to common module

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

@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.analysis.diagnostics
+
+fun interface FirDiagnosticParameterRenderer<in O> {
+    fun render(obj: O): String
+}

compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContext.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.diagnostics.rendering
+
+// holds data about the parameters of the diagnostic we're about to render
+sealed class RenderingContext {
+    abstract operator fun <T> get(key: Key<T>): T
+
+    abstract class Key<out T>(val name: String) {
+        abstract fun compute(objectsToRender: Collection<Any?>): T
+    }
+
+    class Impl(private val objectsToRender: Collection<Any?>) : RenderingContext() {
+        private val data = linkedMapOf<Key<*>, Any?>()
+
+        @Suppress("UNCHECKED_CAST")
+        override fun <T> get(key: Key<T>): T {
+            return data[key] as? T ?: key.compute(objectsToRender).also { data[key] = it }
+        }
+    }
+
+    object Empty : RenderingContext() {
+        override fun <T> get(key: Key<T>): T {
+            return key.compute(emptyList())
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun of(vararg objectsToRender: Any?): RenderingContext {
+            return Impl(objectsToRender.toList())
+        }
+    }
+}

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContext.kt

@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.diagnostics.rendering
-
-import org.jetbrains.kotlin.diagnostics.*
-
-// holds data about the parameters of the diagnostic we're about to render
-sealed class RenderingContext {
-    abstract operator fun <T> get(key: Key<T>): T
-
-    abstract class Key<out T>(val name: String) {
-        abstract fun compute(objectsToRender: Collection<Any?>): T
-    }
-
-    class Impl(private val objectsToRender: Collection<Any?>) : RenderingContext() {
-        private val data = linkedMapOf<Key<*>, Any?>()
-
-        @Suppress("UNCHECKED_CAST")
-        override fun <T> get(key: Key<T>): T {
-            return data[key] as? T ?: key.compute(objectsToRender).also { data[key] = it }
-        }
-    }
-
-    object Empty : RenderingContext() {
-        override fun <T> get(key: Key<T>): T {
-            return key.compute(emptyList())
-        }
-    }
-
-    companion object {
-        @JvmStatic
-        fun of(vararg objectsToRender: Any?): RenderingContext {
-            return Impl(objectsToRender.toList())
-        }
-
-        @JvmStatic
-        fun parameters(d: Diagnostic): List<Any> = when (d) {
-            is SimpleDiagnostic<*> -> listOf()
-            is DiagnosticWithParameters1<*, *> -> listOf(d.a)
-            is DiagnosticWithParameters2<*, *, *> -> listOf(d.a, d.b)
-            is DiagnosticWithParameters3<*, *, *, *> -> listOf(d.a, d.b, d.c)
-            is DiagnosticWithParameters4<*, *, *, *, *> -> listOf(d.a, d.b, d.c, d.d)
-            is ParametrizedDiagnostic<*> -> error("Unexpected diagnostic: ${d::class.java}")
-            else -> listOf()
-        }
-
-        @JvmStatic
-        fun fromDiagnostic(d: Diagnostic): RenderingContext = Impl(parameters(d))
-    }
-}

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/RenderingContextUtils.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.diagnostics.rendering
+
+import org.jetbrains.kotlin.diagnostics.*
+
+fun RenderingContext.Companion.parameters(d: Diagnostic): List<Any> = when (d) {
+    is SimpleDiagnostic<*> -> listOf()
+    is DiagnosticWithParameters1<*, *> -> listOf(d.a)
+    is DiagnosticWithParameters2<*, *, *> -> listOf(d.a, d.b)
+    is DiagnosticWithParameters3<*, *, *, *> -> listOf(d.a, d.b, d.c)
+    is DiagnosticWithParameters4<*, *, *, *, *> -> listOf(d.a, d.b, d.c, d.d)
+    is ParametrizedDiagnostic<*> -> error("Unexpected diagnostic: ${d::class.java}")
+    else -> listOf()
+}
+
+fun RenderingContext.Companion.fromDiagnostic(d: Diagnostic): RenderingContext = RenderingContext.Impl(parameters(d))