[FE] Move diagnostic parameter renderers to common module

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java

@@ -28,6 +28,7 @@ import java.lang.reflect.Modifier;
 import java.util.*;
 
 import static org.jetbrains.kotlin.diagnostics.Errors.*;
+import static org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers.*;
 import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.*;
 import static org.jetbrains.kotlin.diagnostics.rendering.RenderingContext.of;
 

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

@@ -20,9 +20,6 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 
-fun <P> renderParameter(parameter: P, renderer: DiagnosticParameterRenderer<P>?, context: RenderingContext): Any? =
-    renderer?.render(parameter, context) ?: parameter
-
 fun ClassifierDescriptorWithTypeParameters.renderKindWithName(): String =
     DescriptorRenderer.getClassifierKindPrefix(this) + " '" + name + "'"
 

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

@@ -1,68 +0,0 @@
-/*
- * Copyright 2010-2017 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.config.LanguageFeature
-import org.jetbrains.kotlin.config.LanguageVersionSettings
-
-class LanguageFeatureMessageRenderer @JvmOverloads constructor(
-    private val type: Type,
-    private val useHtml: Boolean = false
-) : DiagnosticParameterRenderer<Pair<LanguageFeature, LanguageVersionSettings>> {
-
-    enum class Type {
-        UNSUPPORTED,
-        WARNING,
-        ERROR
-    }
-
-    override fun render(obj: Pair<LanguageFeature, LanguageVersionSettings>, renderingContext: RenderingContext): String {
-        val (feature, settings) = obj
-        val since = feature.sinceVersion
-
-        val sb = StringBuilder()
-        sb.append("The feature \"").append(feature.presentableName).append("\" is ")
-
-        when (type) {
-            Type.UNSUPPORTED ->
-                when {
-                    since == null ->
-                        sb.append("experimental and should be enabled explicitly")
-                    since > settings.languageVersion ->
-                        sb.append("only available since language version ").append(since.versionString)
-                    feature.sinceApiVersion > settings.apiVersion ->
-                        sb.append("only available since API version ").append(feature.sinceApiVersion.versionString)
-                    else ->
-                        sb.append("disabled")
-                }
-
-            Type.WARNING -> sb.append("experimental")
-            Type.ERROR -> sb.append("experimental and disabled")
-        }
-
-        val hintUrl = feature.hintUrl
-        if (hintUrl != null) {
-            if (useHtml) {
-                sb.append(" (").append("see more <a href=\"").append(hintUrl).append("\">here</a>)")
-            } else {
-                sb.append(" (see: ").append(hintUrl).append(")")
-            }
-        }
-
-        return sb.toString()
-    }
-}

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

@@ -66,19 +66,6 @@ object Renderers {
         element.toString()
     }
 
-    @JvmField
-    val EMPTY = Renderer<Any> { "" }
-
-    @JvmField
-    val STRING = Renderer<String> { it }
-
-    @JvmField
-    val THROWABLE = Renderer<Throwable> {
-        val writer = StringWriter()
-        it.printStackTrace(PrintWriter(writer))
-        StringUtil.first(writer.toString(), 2048, true)
-    }
-
     @JvmField
     val NAME = Renderer<Named> { it.name.asString() }
 
@@ -180,15 +167,6 @@ object Renderers {
         }
     }
 
-    @JvmField
-    val RENDER_POSITION_VARIANCE = Renderer { variance: Variance ->
-        when (variance) {
-            Variance.INVARIANT -> "invariant"
-            Variance.IN_VARIANCE -> "in"
-            Variance.OUT_VARIANCE -> "out"
-        }
-    }
-
     @JvmField
     val AMBIGUOUS_CALLS = Renderer { calls: Collection<ResolvedCall<*>> ->
         val descriptors = calls.map { it.resultingDescriptor }
@@ -214,20 +192,6 @@ object Renderers {
             }
     }
 
-    @JvmStatic
-    fun <T> commaSeparated(itemRenderer: DiagnosticParameterRenderer<T>) = ContextDependentRenderer<Collection<T>> { collection, context ->
-        buildString {
-            val iterator = collection.iterator()
-            while (iterator.hasNext()) {
-                val next = iterator.next()
-                append(itemRenderer.render(next, context))
-                if (iterator.hasNext()) {
-                    append(", ")
-                }
-            }
-        }
-    }
-
     @JvmField
     val TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER = Renderer<InferenceErrorData> {
         renderConflictingSubstitutionsInferenceError(it, TabledDescriptorRenderer.create()).toString()