MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fallback to code fragment if we can not parse text as an expression

Browse Source
This commit is contained in:
Egor.Ushakov
2017-09-11 16:08:02 +03:00
parent 5559d6d412
commit 82c4eebbe0
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/DefaultCodeFragmentFactory.java
+14 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.concurrency.Semaphore;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -58,12 +59,20 @@ public class DefaultCodeFragmentFactory extends CodeFragmentFactory {
final JavaCodeFragmentFactory factory = JavaCodeFragmentFactory.getInstance(project);
final String text = item.getText();
final JavaCodeFragment fragment;
JavaCodeFragment fragment = null;
if (CodeFragmentKind.EXPRESSION == item.getKind()) {
final String expressionText = StringUtil.endsWithChar(text, ';')? text.substring(0, text.length() - 1) : text;
fragment = factory.createExpressionCodeFragment(expressionText, context, null, true);
try {
String expressionText = StringUtil.trimTrailing(text, ';');
if (!expressionText.isEmpty()) {
JavaPsiFacade.getElementFactory(project).createExpressionFromText(expressionText, context); // to test that expression is ok
}
fragment = factory.createExpressionCodeFragment(expressionText, context, null, true);
}
catch (IncorrectOperationException ignored) {
}
}
else /*if (CodeFragmentKind.CODE_BLOCK == item.getKind())*/ {
if (fragment == null) {
fragment = factory.createCodeBlockCodeFragment(text, context, true);
}