From 873f4a1b08df0b005ff2ba3b0a799a0f1771c5ef Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 14 Jun 2019 19:38:45 +0900 Subject: [PATCH] Debugger: Accept empty code fragment contexts (KT-19556) --- .../kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt index 6685dbec46d..a17701790ed 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt @@ -79,10 +79,10 @@ object KotlinEvaluatorBuilder : EvaluatorBuilder { return EvaluatorBuilderImpl.getInstance().build(codeFragment, position) } - val context = codeFragment.context ?: evaluationException("Cannot evaluate an expression without a context") - val file = context.containingFile + val context = codeFragment.context + val file = context?.containingFile - if (file !is KtFile) { + if (file != null && file !is KtFile) { reportError(codeFragment, position, "Unknown context${codeFragment.context?.javaClass}") evaluationException("Couldn't evaluate Kotlin expression in this context") }