azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create ExpressionCodeFragment only for expression mode in evaluate expression

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-04-23 11:29:58 +04:00
parent f54aee150e
commit 2eff4e2300
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt
+9 -4
View File
@@ -31,14 +31,19 @@ import org.jetbrains.jet.JetNodeType
import org.jetbrains.jet.lexer.JetTokens import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragmentImpl import org.jetbrains.jet.lang.psi.JetExpressionCodeFragmentImpl
import com.intellij.psi.PsiCodeBlock import com.intellij.psi.PsiCodeBlock
import com.intellij.debugger.engine.evaluation.CodeFragmentKind
import com.intellij.psi.JavaCodeFragmentFactory
class KotlinCodeFragmentFactory: CodeFragmentFactory() { class KotlinCodeFragmentFactory: CodeFragmentFactory() {
override fun createCodeFragment(item: TextWithImports, context: PsiElement?, project: Project): JavaCodeFragment { override fun createCodeFragment(item: TextWithImports, context: PsiElement?, project: Project): JavaCodeFragment {
val codeFragment = JetExpressionCodeFragmentImpl(project, "fragment.kt", item.getText(), context) if (item.getKind() == CodeFragmentKind.EXPRESSION) {
if (item.getImports().isNotEmpty()) { val codeFragment = JetExpressionCodeFragmentImpl(project, "fragment.kt", item.getText(), context)
codeFragment.addImportsFromString(item.getImports()) 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 { override fun createPresentationCodeFragment(item: TextWithImports, context: PsiElement?, project: Project): JavaCodeFragment {