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-70913 smart step into should not propose methods from both branches in conditional expressions - support if statement

Browse Source
This commit is contained in:
Egor.Ushakov
2016-08-31 12:44:59 +03:00
parent 877358aea3
commit 950322165f
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/JavaSmartStepIntoHandler.java
+27 -13
View File
@@ -201,28 +201,42 @@ public class JavaSmartStepIntoHandler extends JvmSmartStepIntoHandler {
}
}
@Override
public void visitIfStatement(PsiIfStatement statement) {
visitConditional(statement.getCondition(), statement.getThenBranch(), statement.getElseBranch());
}
@Override
public void visitConditionalExpression(PsiConditionalExpression expression) {
PsiExpression condition = expression.getCondition();
condition.accept(this);
ThreeState conditionRes = ThreeState.UNSURE;
if (!DebuggerUtils.hasSideEffects(condition)) {
visitConditional(expression.getCondition(), expression.getThenExpression(), expression.getElseExpression());
}
private void visitConditional(@Nullable PsiElement condition,
@Nullable PsiElement thenBranch,
@Nullable PsiElement elseBranch) {
if (condition != null) {
condition.accept(this);
}
ThreeState conditionRes = evaluateCondition(condition);
if (conditionRes != ThreeState.NO && thenBranch != null) {
thenBranch.accept(this);
}
if (conditionRes != ThreeState.YES && elseBranch != null) {
elseBranch.accept(this);
}
}
private ThreeState evaluateCondition(@Nullable PsiElement condition) {
if (condition != null && !DebuggerUtils.hasSideEffects(condition)) {
try {
ExpressionEvaluator evaluator = EvaluatorBuilderImpl.getInstance().build(condition, position);
conditionRes = ThreeState.fromBoolean(DebuggerUtilsEx.evaluateBoolean(evaluator, debuggerContext.createEvaluationContext()));
return ThreeState.fromBoolean(DebuggerUtilsEx.evaluateBoolean(evaluator, debuggerContext.createEvaluationContext()));
}
catch (EvaluateException e) {
LOG.info(e);
}
}
PsiExpression thenExpression = expression.getThenExpression();
if (conditionRes != ThreeState.NO && thenExpression != null) {
thenExpression.accept(this);
}
PsiExpression elseExpression = expression.getElseExpression();
if (conditionRes != ThreeState.YES && elseExpression != null) {
elseExpression.accept(this);
}
return ThreeState.UNSURE;
}
@Override
java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
+5 -2
View File
@@ -423,11 +423,14 @@ public abstract class DebuggerUtils {
}
}
public static boolean hasSideEffects(PsiElement element) {
public static boolean hasSideEffects(@Nullable PsiElement element) {
return hasSideEffectsOrReferencesMissingVars(element, null);
}
public static boolean hasSideEffectsOrReferencesMissingVars(PsiElement element, @Nullable final Set<String> visibleLocalVariables) {
public static boolean hasSideEffectsOrReferencesMissingVars(@Nullable PsiElement element, @Nullable final Set<String> visibleLocalVariables) {
if (element == null) {
return false;
}
final Ref<Boolean> rv = new Ref<>(Boolean.FALSE);
element.accept(new JavaRecursiveElementWalkingVisitor() {
@Override