enable split if with redundant parenthesis

This commit is contained in:
Anna.Kozlova
2018-03-29 16:11:08 +02:00
parent 34ef66e51c
commit 04b2a7b199
2 changed files with 5 additions and 3 deletions
@@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
@@ -42,8 +43,9 @@ public class SplitIfAction extends PsiElementBaseIntentionAction {
final PsiPolyadicExpression expression = SplitConditionUtil.findCondition(element);
if (expression == null) return false;
if (!(expression.getParent() instanceof PsiIfStatement)) return false;
PsiIfStatement ifStatement = (PsiIfStatement)expression.getParent();
PsiElement parent = PsiUtil.skipParenthesizedExprUp(expression.getParent());
if (!(parent instanceof PsiIfStatement)) return false;
PsiIfStatement ifStatement = (PsiIfStatement)parent;
if (!PsiTreeUtil.isAncestor(ifStatement.getCondition(), expression, false)) return false;
if (ifStatement.getThenBranch() == null) return false;
@@ -1,6 +1,6 @@
class C {
void foo() {
if ((a) |<caret>| (b)) {
if (((a) |<caret>| (b))) {
call();
}
}