Don't emit message for 'x < 0 or x > 100'

Author: cdce8p

pylint/extensions/code_style.py

@@ -6,6 +6,7 @@
 
 import difflib
 from copy import copy
+from enum import IntFlag, auto
 from typing import TYPE_CHECKING, TypeGuard, cast
 
 from astroid import nodes
@@ -18,6 +19,12 @@
     from pylint.lint import PyLinter
 
 
+class InvertibleValues(IntFlag):
+    NO = 0
+    YES = auto()
+    EXPLICIT_NEGATION = auto()
+
+
 class CodeStyleChecker(BaseChecker):
     """Checkers that can improve code consistency.
 
@@ -366,16 +373,21 @@ def visit_assign(self, node: nodes.Assign) -> None:
             )
 
     @staticmethod
-    def _can_be_inverted(node: nodes.NodeNG) -> bool:
-        match node:
-            case nodes.UnaryOp(op="not"):
-                return True
-            case nodes.Compare(
-                ops=[("!=" | "not in", _)]
-                | [("<" | "<=" | ">" | ">=", nodes.Const(value=int()))]
-            ):
-                return True
-        return False
+    def _can_be_inverted(values: list[nodes.NodeNG]) -> InvertibleValues:
+        invertible = InvertibleValues.NO
+        for node in values:
+            match node:
+                case nodes.UnaryOp(op="not") | nodes.Compare(
+                    ops=[("!=" | "not in", _)]
+                ):
+                    invertible |= InvertibleValues.EXPLICIT_NEGATION
+                case nodes.Compare(
+                    ops=[("<" | "<=" | ">" | ">=", nodes.Const(value=int()))]
+                ):
+                    invertible |= InvertibleValues.YES
+                case _:
+                    return InvertibleValues.NO
+        return invertible
 
     @staticmethod
     def _invert_node(node: nodes.NodeNG) -> nodes.NodeNG:
@@ -408,7 +420,11 @@ def _invert_node(node: nodes.NodeNG) -> nodes.NodeNG:
 
     @only_required_for_messages("improve-conditionals")
     def visit_boolop(self, node: nodes.BoolOp) -> None:
-        if node.op == "or" and all(self._can_be_inverted(val) for val in node.values):
+        if (
+            node.op == "or"
+            and (invertible := self._can_be_inverted(node.values))
+            and invertible & InvertibleValues.EXPLICIT_NEGATION
+        ):
             new_boolop = copy(node)
             new_boolop.op = "and"
             new_boolop.postinit([self._invert_node(val) for val in node.values])

tests/functional/ext/code_style/cs_improve_conditionals.py

@@ -12,11 +12,14 @@ def f1(expr, node_cls, x, y, z):
     elif not isinstance(expr, node_cls) or expr.attrname == "__init__":
         ...
 
-    if not isinstance(expr, node_cls) or expr.attrname != "__init__":  # [improve-conditionals]
+    if x < 0 or x > 100:
+        ...
+    elif x > 0 or y >= 1:
         ...
-    elif x > 0 or y >= 1:  # [improve-conditionals]
+    elif x < 0 or y <= 1:
         ...
-    elif x < 0 or y <= 1:  # [improve-conditionals]
+
+    if not isinstance(expr, node_cls) or expr.attrname != "__init__":  # [improve-conditionals]
         ...
     elif not x or y not in z:  # [improve-conditionals]
         ...

tests/functional/ext/code_style/cs_improve_conditionals.txt

@@ -1,6 +1,4 @@
-improve-conditionals:15:7:15:68:f1:Rewrite conditional expression to 'not (isinstance(expr, node_cls) and expr.attrname == '__init__')':HIGH
-improve-conditionals:17:9:17:24:f1:Rewrite conditional expression to 'not (x <= 0 and y < 1)':HIGH
-improve-conditionals:19:9:19:24:f1:Rewrite conditional expression to 'not (x >= 0 and y > 1)':HIGH
-improve-conditionals:21:9:21:28:f1:Rewrite conditional expression to 'not (x and y in z)':HIGH
-improve-conditionals:23:9:23:29:f1:Rewrite conditional expression to 'x and y':HIGH
-improve-conditionals:25:16:25:30:f1:Rewrite conditional expression to 'not (y and z)':HIGH
+improve-conditionals:22:7:22:68:f1:Rewrite conditional expression to 'not (isinstance(expr, node_cls) and expr.attrname == '__init__')':HIGH
+improve-conditionals:24:9:24:28:f1:Rewrite conditional expression to 'not (x and y in z)':HIGH
+improve-conditionals:26:9:26:29:f1:Rewrite conditional expression to 'x and y':HIGH
+improve-conditionals:28:16:28:30:f1:Rewrite conditional expression to 'not (y and z)':HIGH