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

PY-14002 Do not alter binary expressions with not comparison operator

Browse Source
This commit is contained in:
Mikhail Golubev
2014-12-12 18:36:42 +03:00
parent 564cfbb7e7
commit a4cbeec130
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/quickfix/ChainedComparisonsQuickFix.java
+20 -7
View File
@@ -23,6 +23,7 @@ import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.psi.PyBinaryExpression;
import com.jetbrains.python.psi.PyElementGenerator;
import com.jetbrains.python.psi.PyElementType;
import com.jetbrains.python.psi.PyExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -37,6 +38,7 @@ import static com.jetbrains.python.psi.PyUtil.as;
* For instance, a < b and b < c --> a < b < c
*/
public class ChainedComparisonsQuickFix implements LocalQuickFix {
boolean myIsLeftLeft;
boolean myIsRightLeft;
boolean getInnerRight;
@@ -69,12 +71,11 @@ public class ChainedComparisonsQuickFix implements LocalQuickFix {
if (expression != null && expression.isWritable()) {
final PyBinaryExpression rightExpression = as(expression.getRightExpression(), PyBinaryExpression.class);
PyBinaryExpression leftExpression = as(expression.getLeftExpression(), PyBinaryExpression.class);
if (rightExpression != null && leftExpression != null && expression.getOperator() == PyTokenTypes.AND_KEYWORD) {
if (getInnerRight && leftExpression.getRightExpression() instanceof PyBinaryExpression &&
leftExpression.getOperator() == PyTokenTypes.AND_KEYWORD) {
if (rightExpression != null && leftExpression != null && isLogicalAndExpression(expression)) {
if (getInnerRight && leftExpression.getRightExpression() instanceof PyBinaryExpression && isLogicalAndExpression(leftExpression)) {
leftExpression = (PyBinaryExpression)leftExpression.getRightExpression();
}
checkOperator(leftExpression, rightExpression, project);
checkOperator(assertNotNull(leftExpression), rightExpression, project);
}
}
}
@@ -126,7 +127,7 @@ public class ChainedComparisonsQuickFix implements LocalQuickFix {
@NotNull
private static PsiElement getLeftestOperator(@NotNull PyBinaryExpression expression) {
PsiElement op = expression.getPsiOperator();
while (expression.getLeftExpression() instanceof PyBinaryExpression) {
while (isComparisonExpression(expression.getLeftExpression())) {
expression = (PyBinaryExpression)expression.getLeftExpression();
op = expression.getPsiOperator();
}
@@ -139,7 +140,7 @@ public class ChainedComparisonsQuickFix implements LocalQuickFix {
final PsiElement operator = leftExpression.getPsiOperator();
final PyExpression right = leftExpression.getRightExpression();
PyExpression left = leftExpression.getLeftExpression();
if (left instanceof PyBinaryExpression) {
if (isComparisonExpression(left)) {
left = invertExpression((PyBinaryExpression)left, elementGenerator);
}
final String newOperator = invertOperator(assertNotNull(operator));
@@ -169,7 +170,7 @@ public class ChainedComparisonsQuickFix implements LocalQuickFix {
PyExpression left = expression.getLeftExpression();
PyExpression right = expression.getRightExpression();
PsiElement operator = expression.getPsiOperator();
while (left instanceof PyBinaryExpression) {
while (isComparisonExpression(left)) {
assert operator != null;
right = elementGenerator.createBinaryExpression(operator.getText(), ((PyBinaryExpression)left).getRightExpression(), right);
operator = ((PyBinaryExpression)left).getPsiOperator();
@@ -177,4 +178,16 @@ public class ChainedComparisonsQuickFix implements LocalQuickFix {
}
return right;
}
private static boolean isComparisonExpression(@Nullable PyExpression expression) {
if (!(expression instanceof PyBinaryExpression)) {
return false;
}
final PyElementType operator = ((PyBinaryExpression)expression).getOperator();
return PyTokenTypes.RELATIONAL_OPERATIONS.contains(operator) || PyTokenTypes.EQUALITY_OPERATIONS.contains(operator);
}
private static boolean isLogicalAndExpression(@Nullable PyExpression expression) {
return expression instanceof PyBinaryExpression && ((PyBinaryExpression)expression).getOperator() == PyTokenTypes.AND_KEYWORD;
}
}
python/testData/inspections/ChainedComparisonWithCommonBinaryExpression.py
+2
View File
@@ -0,0 +1,2 @@
if <weak_warning descr="Simplify chained comparison">3 < x<caret> + 1 and x + 1 < 10</weak_warning>:
pass
python/testData/inspections/ChainedComparisonWithCommonBinaryExpression_after.py
+2
View File
@@ -0,0 +1,2 @@
if 3 < x + 1 < 10:
pass
python/testSrc/com/jetbrains/python/PyQuickFixTest.java
+6
View File
@@ -251,6 +251,12 @@ public class PyQuickFixTest extends PyTestCase {
PyBundle.message("QFIX.chained.comparison"), true, true);
}
// PY-14002
public void testChainedComparisonWithCommonBinaryExpression() {
doInspectionTest("ChainedComparisonWithCommonBinaryExpression.py", PyChainedComparisonsInspection.class,
PyBundle.message("QFIX.chained.comparison"), true, true);
}
public void testStatementEffect() { // PY-1362, PY-2585
doInspectionTest("StatementEffect.py", PyStatementEffectInspection.class,
PyBundle.message("QFIX.statement.effect"), true, true);