From cdf081ddc381dc55731c61f94eaaee1d3be6a961 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 6 Mar 2015 15:49:46 +0300 Subject: [PATCH] Fix for exception: JetCodeFragment with context null #KT-6876 Fixed --- .../idea/debugger/evaluate/KotlinCodeFragmentFactory.kt | 5 +++++ 1 file changed, 5 insertions(+) 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 9b738f85384..d1c004033d7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -107,6 +107,11 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() { return getContextElement(elementAt.getOrigin()) } + // If label for some variable is set + if (elementAt.getParent() is JetCodeFragment) { + return elementAt.getParent().getContext() + } + val expressionAtOffset = PsiTreeUtil.findElementOfClassAtOffset(elementAt.getContainingFile()!!, elementAt.getTextOffset(), javaClass(), false) if (expressionAtOffset != null) { return expressionAtOffset