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

"Add clarifying parentheses" intention can now add parentheses around the condition of a conditional expression

Browse Source
This commit is contained in:
Bas Leijdekkers
2011-02-27 08:41:02 +01:00
parent 17745863e8
commit cda8d7545f
2 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntentionPowerPak/src/com/siyeh/ipp/parenthesis/AddClarifyingParenthesesIntention.java
+13 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2008 Bas Leijdekkers
* Copyright 2006-2011 Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,6 +38,18 @@ public class AddClarifyingParenthesesIntention extends Intention {
}
final StringBuilder newExpression =
createReplacementText(expression, new StringBuilder());
final PsiElement parent = expression.getParent();
if (parent instanceof PsiConditionalExpression) {
final PsiConditionalExpression conditionalExpression =
(PsiConditionalExpression) parent;
final PsiExpression condition =
conditionalExpression.getCondition();
if (expression == condition) {
replaceExpression('(' + newExpression.toString() + ')',
expression);
return;
}
}
replaceExpression(newExpression.toString(), expression);
}
plugins/IntentionPowerPak/src/com/siyeh/ipp/parenthesis/AddClarifyingParenthesesPredicate.java
+25 -21
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2008 Bas Leijdekkers
* Copyright 2006-2011 Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
*/
package com.siyeh.ipp.parenthesis;
import com.intellij.psi.PsiBinaryExpression;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiInstanceOfExpression;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.siyeh.ipp.base.PsiElementPredicate;
import org.jetbrains.annotations.NotNull;
@@ -26,26 +23,33 @@ import org.jetbrains.annotations.NotNull;
class AddClarifyingParenthesesPredicate implements PsiElementPredicate {
public boolean satisfiedBy(@NotNull PsiElement element) {
if (!(element instanceof PsiBinaryExpression)) {
return element instanceof PsiInstanceOfExpression &&
element.getParent()instanceof PsiBinaryExpression;
}
final PsiBinaryExpression binaryExpression =
(PsiBinaryExpression)element;
final IElementType tokenType = binaryExpression.getOperationTokenType();
final PsiElement parent = element.getParent();
if (parent instanceof PsiExpression) {
final PsiExpression expression = (PsiExpression)parent;
if (needsParentheses(expression, tokenType)) {
if (element instanceof PsiBinaryExpression) {
final PsiBinaryExpression binaryExpression =
(PsiBinaryExpression) element;
final IElementType tokenType =
binaryExpression.getOperationTokenType();
if (parent instanceof PsiExpression) {
final PsiExpression expression = (PsiExpression) parent;
if (needsParentheses(expression, tokenType)) {
return true;
}
}
final PsiExpression lhs = binaryExpression.getLOperand();
if (needsParentheses(lhs, tokenType)) {
return true;
}
final PsiExpression rhs = binaryExpression.getROperand();
return needsParentheses(rhs, tokenType);
} else if (parent instanceof PsiConditionalExpression) {
final PsiConditionalExpression conditionalExpression =
(PsiConditionalExpression) parent;
final PsiExpression condition =
conditionalExpression.getCondition();
return element == condition;
}
final PsiExpression lhs = binaryExpression.getLOperand();
if (needsParentheses(lhs, tokenType)) {
return true;
}
final PsiExpression rhs = binaryExpression.getROperand();
return needsParentheses(rhs, tokenType);
return element instanceof PsiInstanceOfExpression &&
parent instanceof PsiBinaryExpression;
}
private static boolean needsParentheses(PsiExpression expression,