From c8a1517190b1f831deb3aabafae2ba7cd238e56e Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 7 Mar 2018 00:00:44 +0300
Subject: [PATCH] Fix EA-113820: Accept also nullable elements in
 'getRelevantElement()'

---
 .../kotlin/idea/debugger/DebuggerClassNameProvider.kt       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
index ef1a571ad9c..513115982ad 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
@@ -59,7 +59,11 @@ class DebuggerClassNameProvider(
                 KtFunctionLiteral::class.java,
                 KtAnonymousInitializer::class.java)
 
-        internal fun getRelevantElement(element: PsiElement): PsiElement? {
+        internal fun getRelevantElement(element: PsiElement?): PsiElement? {
+            if (element == null) {
+                return null
+            }
+
             for (elementType in CLASS_ELEMENT_TYPES) {
                 if (elementType.isInstance(element)) {
                     return element