From 2eff4e23005ee969193ca911c5e9f122e8953d78 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 23 Apr 2014 11:29:58 +0400 Subject: [PATCH] Create ExpressionCodeFragment only for expression mode in evaluate expression --- .../debugger/evaluate/KotlinCodeFragmentFactory.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt index 3c837616a57..d560aa99e2a 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -31,14 +31,19 @@ import org.jetbrains.jet.JetNodeType import org.jetbrains.jet.lexer.JetTokens import org.jetbrains.jet.lang.psi.JetExpressionCodeFragmentImpl import com.intellij.psi.PsiCodeBlock +import com.intellij.debugger.engine.evaluation.CodeFragmentKind +import com.intellij.psi.JavaCodeFragmentFactory class KotlinCodeFragmentFactory: CodeFragmentFactory() { override fun createCodeFragment(item: TextWithImports, context: PsiElement?, project: Project): JavaCodeFragment { - val codeFragment = JetExpressionCodeFragmentImpl(project, "fragment.kt", item.getText(), context) - if (item.getImports().isNotEmpty()) { - codeFragment.addImportsFromString(item.getImports()) + if (item.getKind() == CodeFragmentKind.EXPRESSION) { + val codeFragment = JetExpressionCodeFragmentImpl(project, "fragment.kt", item.getText(), context) + if (item.getImports().isNotEmpty()) { + codeFragment.addImportsFromString(item.getImports()) + } + return codeFragment } - return codeFragment + return JavaCodeFragmentFactory.getInstance(project)!!.createCodeBlockCodeFragment(item.getText(), context, false) } override fun createPresentationCodeFragment(item: TextWithImports, context: PsiElement?, project: Project): JavaCodeFragment {