From e82eb38ec3b12582d2df6e5adbeae03f51437e7f Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 7 Nov 2014 15:50:02 +0300 Subject: [PATCH] Debugger: make KotlinRenderer inapplicable if at least one of custom renderer is defined --- .../jet/plugin/debugger/render/KotlinObjectRenderer.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinObjectRenderer.kt b/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinObjectRenderer.kt index ee1c4a83d82..f524a717c9d 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinObjectRenderer.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinObjectRenderer.kt @@ -52,6 +52,14 @@ public open class KotlinObjectRenderer : ClassRenderer() { override fun isApplicable(jdiType: Type?): Boolean { if (!super.isApplicable(jdiType)) return false + var isCustomRendererApplicable = false + NodeRendererSettings.getInstance().getCustomRenderers().iterateRenderers { + isCustomRendererApplicable = it.isApplicable(jdiType) + !isCustomRendererApplicable + } + + if (isCustomRendererApplicable) return false + return jdiType.isKotlinClass() }