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

ConvertCompareToToEqualsIntention: support parentheses

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-06 13:47:17 +07:00
parent 4d1b9a6653
commit fe6ebf0a01
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompareToToEqualsIntention.java
View File

@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.MethodCallUtils;
@@ -94,8 +95,8 @@ public class ConvertCompareToToEqualsIntention extends BaseElementAtCaretIntenti
return null;
}
PsiMethodCallExpression compareToExpression;
final PsiExpression lhs = binaryExpression.getLOperand();
final PsiExpression rhs = binaryExpression.getROperand();
final PsiExpression lhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getLOperand());
final PsiExpression rhs = PsiUtil.skipParenthesizedExprDown(binaryExpression.getROperand());
if (lhs instanceof PsiMethodCallExpression) {
compareToExpression = (PsiMethodCallExpression)lhs;
if (!MethodCallUtils.isCompareToCall(compareToExpression) || !ExpressionUtils.isZero(rhs)) {

13
java/java-tests/testData/codeInsight/convertCompareToToEquals/parentheses.java Normal file
View File

@@ -0,0 +1,13 @@
import java.lang.Integer;
import java.lang.String;
class X {
void m() {
Integer i1 = new Integer(0);
Integer i2 = new Integer(2);
boolean b = (i1.compareT<caret>o(i2)) == (0);
}
}

13
java/java-tests/testData/codeInsight/convertCompareToToEquals/parentheses_after.java Normal file
View File

@@ -0,0 +1,13 @@
import java.lang.Integer;
import java.lang.String;
class X {
void m() {
Integer i1 = new Integer(0);
Integer i2 = new Integer(2);
boolean b = i1.equals(i2)<caret>;
}
}

4
java/java-tests/testSrc/com/intellij/java/codeInsight/intention/ConvertCompareToToEqualsTest.java
View File

@@ -40,6 +40,10 @@ public class ConvertCompareToToEqualsTest extends JavaCodeInsightFixtureTestCase
doTest();
}
public void testParentheses() {
doTest();
}
public void testNotAvailable() {
doTestNotAvailable();
}