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

IDEA-74190 Debugger:Evaluate: Code Fragment mode parsing is broken

Browse Source
This commit is contained in:
peter
2011-09-13 10:17:47 +02:00
parent 1d6bd69e35
commit fe296fd7f0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/EvaluateActionHandler.java
+6 -2
View File
@@ -121,13 +121,17 @@ public class EvaluateActionHandler extends DebuggerActionHandler {
defaultExpression = new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "");
}
CodeFragmentKind kind = DebuggerSettings.EVALUATE_FRAGMENT.equals(dialogType) ? CodeFragmentKind.CODE_BLOCK : CodeFragmentKind.EXPRESSION;
DebuggerSettings.getInstance().EVALUATION_DIALOG_TYPE = dialogType;
TextWithImportsImpl text = new TextWithImportsImpl(kind, defaultExpression.getText(), defaultExpression.getImports(), defaultExpression.getFileType());
final DialogWrapper dialog;
if(DebuggerSettings.EVALUATE_FRAGMENT.equals(dialogType)) {
dialog = new StatementEvaluationDialog(project, defaultExpression);
dialog = new StatementEvaluationDialog(project, text);
}
else {
dialog = new ExpressionEvaluationDialog(project, defaultExpression);
dialog = new ExpressionEvaluationDialog(project, text);
}
dialog.show();
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiExpressionCodeFragment;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public final class TextWithImportsImpl implements TextWithImports{
@@ -52,7 +53,7 @@ public final class TextWithImportsImpl implements TextWithImports{
}
}
public TextWithImportsImpl (CodeFragmentKind kind, @NotNull String text, @NotNull String imports, @NotNull FileType fileType) {
public TextWithImportsImpl (CodeFragmentKind kind, @NotNull String text, @NotNull String imports, @Nullable FileType fileType) {
myKind = kind;
myText = text;
myImports = imports;