From efeccd0929d2d2cb7d0e9f18895e49ef3aa4d85a Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 22 Nov 2016 20:51:52 +0300
Subject: [PATCH] Filter out variables with null values (EA-87276)

---
 .../idea/debugger/evaluate/KotlinCodeFragmentFactory.kt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
index b428bce2677..20ef8eb32dc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
@@ -167,7 +167,12 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
                     else
                         debuggerContext.frameProxy?.stackFrame
 
-                    frameInfo = FrameInfo(frame?.thisObject(), frame?.let { it.getValues(it.visibleVariables()) } ?: emptyMap())
+                    val visibleVariables = frame?.let {
+                        val values = it.getValues(it.visibleVariables())
+                        values.filterValues { it != null }
+                    } ?: emptyMap()
+
+                    frameInfo = FrameInfo(frame?.thisObject(), visibleVariables)
                 }
                 catch(ignored: AbsentInformationException) {
                     // Debug info unavailable