From e2fa9397c8e56fc45d3502386832a0535f79fd28 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 15 Jul 2015 15:08:13 +0300 Subject: [PATCH] Debugger: fix context element in SourcePositionProvider --- .../kotlin/idea/debugger/KotlinSourcePositionProvider.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt index adcfe5e9681..50274a38518 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt @@ -34,6 +34,7 @@ import com.sun.jdi.ClassNotPreparedException import com.sun.jdi.ReferenceType import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.idea.caches.resolve.analyze +import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetPsiFactory @@ -62,7 +63,7 @@ public class KotlinSourcePositionProvider: SourcePositionProvider() { private fun computeSourcePosition(descriptor: LocalVariableDescriptor, project: Project, context: DebuggerContextImpl, nearest: Boolean): SourcePosition? { val place = PositionUtil.getContextElement(context) ?: return null - val contextElement = PsiTreeUtil.getParentOfType(place, javaClass()) ?: return null + val contextElement = KotlinCodeFragmentFactory.getContextElement(place) ?: return null val codeFragment = JetPsiFactory(project).createExpressionCodeFragment(descriptor.getName(), contextElement) val expression = codeFragment.getContentElement()