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

IDEA-114604 Evaluate Expression doesn't change context after navigating call stack +review

Browse Source
This commit is contained in:
Vladimir Krivosheev
2013-10-08 19:19:02 +02:00
parent f9411d3f8e
commit c5ce0b8fc9
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
+18 -5
View File
@@ -29,6 +29,7 @@ import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.evaluation.EvaluationMode;
import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
import com.intellij.xdebugger.frame.XStackFrame;
import com.intellij.xdebugger.impl.XDebugSessionImpl;
import com.intellij.xdebugger.impl.actions.XDebuggerActions;
import com.intellij.xdebugger.impl.ui.XDebuggerEditorBase;
@@ -51,7 +52,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
private final JPanel myResultPanel;
private final XDebuggerTreePanel myTreePanel;
private EvaluationInputComponent myInputComponent;
private final XDebuggerEvaluator myEvaluator;
private final XDebuggerEvaluator myInitialEvaluator;
private final XDebugSession mySession;
private final XDebuggerEditorsProvider myEditorsProvider;
private EvaluationMode myMode;
@@ -88,7 +89,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
myResultPanel = new JPanel(new BorderLayout());
myResultPanel.add(new JLabel(XDebuggerBundle.message("xdebugger.evaluate.label.result")), BorderLayout.NORTH);
myResultPanel.add(myTreePanel.getMainPanel(), BorderLayout.CENTER);
myEvaluator = evaluator;
myInitialEvaluator = evaluator;
myMainPanel = new JPanel(new BorderLayout());
mySwitchModeAction = new SwitchModeAction();
@@ -108,7 +109,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
EvaluationMode mode = EvaluationMode.EXPRESSION;
if (text.indexOf('\n') != -1) {
if (myEvaluator.isCodeFragmentEvaluationSupported()) {
if (getEffectiveEvaluator().isCodeFragmentEvaluationSupported()) {
mode = EvaluationMode.CODE_FRAGMENT;
}
else {
@@ -124,10 +125,22 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
evaluate();
}
@NotNull
private XDebuggerEvaluator getEffectiveEvaluator() {
XStackFrame frame = mySession.getCurrentStackFrame();
if (frame != null) {
XDebuggerEvaluator evaluator = frame.getEvaluator();
if (evaluator != null) {
return evaluator;
}
}
return myInitialEvaluator;
}
@NotNull
@Override
protected Action[] createActions() {
if (myEvaluator.isCodeFragmentEvaluationSupported()) {
if (getEffectiveEvaluator().isCodeFragmentEvaluationSupported()) {
return new Action[]{getOKAction(), mySwitchModeAction, getCancelAction()};
}
return super.createActions();
@@ -203,7 +216,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
final XDebuggerEditorBase inputEditor = myInputComponent.getInputEditor();
inputEditor.saveTextInHistory();
String expression = inputEditor.getText();
myEvaluator.evaluate(expression, evaluationCallback, null, inputEditor.getMode());
getEffectiveEvaluator().evaluate(expression, evaluationCallback, null, inputEditor.getMode());
}
@Override