diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticParameterRenderer.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticParameterRenderer.kt
index 1d445f643ca..8c61c2910ab 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticParameterRenderer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticParameterRenderer.kt
@@ -20,8 +20,14 @@ interface DiagnosticParameterRenderer<in O> {
     fun render(obj: O, renderingContext: RenderingContext): String
 }
 
-fun <O> Renderer(block: (O) -> String) = object : DiagnosticParameterRenderer<O> {
-    override fun render(obj: O, renderingContext: RenderingContext): String = block(obj)
+interface ContextIndependentParameterRenderer<in O> : DiagnosticParameterRenderer<O> {
+    override fun render(obj: O, renderingContext: RenderingContext): String = render(obj)
+
+    fun render(obj: O): String
+}
+
+fun <O> Renderer(block: (O) -> String) = object : ContextIndependentParameterRenderer<O> {
+    override fun render(obj: O): String = block(obj)
 }
 
 fun <O> ContextDependentRenderer(block: (O, RenderingContext) -> String) = object : DiagnosticParameterRenderer<O> {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
index 655732f8649..dcc3624ec19 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
@@ -111,8 +111,8 @@ object Renderers {
     }
 
     @JvmField
-    val CAPITALIZED_DECLARATION_NAME_WITH_KIND_AND_PLATFORM = ContextDependentRenderer<DeclarationDescriptor> { descriptor, context ->
-        val declarationWithNameAndKind = DECLARATION_NAME_WITH_KIND.render(descriptor, context)
+    val CAPITALIZED_DECLARATION_NAME_WITH_KIND_AND_PLATFORM = Renderer<DeclarationDescriptor> { descriptor ->
+        val declarationWithNameAndKind = DECLARATION_NAME_WITH_KIND.render(descriptor)
         val withPlatform = if (descriptor is MemberDescriptor && descriptor.isActual)
             "actual $declarationWithNameAndKind"
         else
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
index 4d8d7112cfe..550780966ac 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
@@ -86,8 +86,8 @@ object IdeRenderers {
     }
 
     @JvmField
-    val HTML_THROWABLE = ContextDependentRenderer<Throwable> { throwable, context ->
-        Renderers.THROWABLE.render(throwable, context).replace("\n", "<br/>")
+    val HTML_THROWABLE = Renderer<Throwable> { throwable ->
+        Renderers.THROWABLE.render(throwable).replace("\n", "<br/>")
     }
 
     @JvmField