Change name to 'consider-rewriting-conditional'

cdce8p · Pierre-Sassoulas · cdce8p · commit f83f16fe65a8 · 2025-10-13T13:06:55.000+02:00
Co-authored-by: Pierre Sassoulas &lt;pierre.sassoulas@gmail.com&gt;
diff --git a/doc/data/messages/c/consider-rewriting-conditional/bad.py b/doc/data/messages/c/consider-rewriting-conditional/bad.py
@@ -1,5 +1,7 @@
 def is_penguin(animal):
     # Penguins are the only flightless, kneeless sea birds
     return animal.is_seabird() and (
-        not animal.can_fly() or not animal.has_visible_knee()  # [improve-conditionals]
+        # +1: [consider-rewriting-conditional]
+        not animal.can_fly()
+        or not animal.has_visible_knee()
     )
diff --git a/doc/data/messages/c/consider-rewriting-conditional/good.py b/doc/data/messages/c/consider-rewriting-conditional/good.py
diff --git a/doc/data/messages/c/consider-rewriting-conditional/pylintrc b/doc/data/messages/c/consider-rewriting-conditional/pylintrc
diff --git a/doc/user_guide/checkers/extensions.rst b/doc/user_guide/checkers/extensions.rst
@@ -92,7 +92,7 @@ Code Style checker Messages
   Using math.inf or math.nan permits to benefit from typing and it is up to 4
   times faster than a float call (after the initial import of math). This check
   also catches typos in float calls as a side effect.
-:improve-conditionals (R6107): *Rewrite conditional expression to '%s'*
+:consider-rewriting-conditional (R6107): *Rewrite conditional expression to '%s'*
   Rewrite negated if expressions to improve readability. This style is simpler
   and also permits converting long if/elif chains to match case with more ease.
   Disabled by default!
diff --git a/doc/user_guide/configuration/all-options.rst b/doc/user_guide/configuration/all-options.rst
@@ -233,7 +233,7 @@ Standard Checkers
 
    confidence = ["HIGH", "CONTROL_FLOW", "INFERENCE", "INFERENCE_FAILURE", "UNDEFINED"]
 
-   disable = ["bad-inline-option", "consider-using-augmented-assign", "deprecated-pragma", "file-ignored", "improve-conditionals", "locally-disabled", "prefer-typing-namedtuple", "raw-checker-failed", "suppressed-message", "use-implicit-booleaness-not-comparison-to-string", "use-implicit-booleaness-not-comparison-to-zero", "use-symbolic-message-instead", "useless-suppression"]
+   disable = ["bad-inline-option", "consider-rewriting-conditional", "consider-using-augmented-assign", "deprecated-pragma", "file-ignored", "locally-disabled", "prefer-typing-namedtuple", "raw-checker-failed", "suppressed-message", "use-implicit-booleaness-not-comparison-to-string", "use-implicit-booleaness-not-comparison-to-zero", "use-symbolic-message-instead", "useless-suppression"]
 
    enable = []
 
diff --git a/doc/user_guide/messages/messages_overview.rst b/doc/user_guide/messages/messages_overview.rst
@@ -494,6 +494,7 @@ All messages in the refactor category:
    refactor/consider-math-not-float
    refactor/consider-merging-isinstance
    refactor/consider-refactoring-into-while-condition
+   refactor/consider-rewriting-conditional
    refactor/consider-swap-variables
    refactor/consider-using-alias
    refactor/consider-using-assignment-expr
@@ -516,7 +517,6 @@ All messages in the refactor category:
    refactor/duplicate-code
    refactor/else-if-used
    refactor/empty-comment
-   refactor/improve-conditionals
    refactor/inconsistent-return-statements
    refactor/literal-comparison
    refactor/magic-value-comparison
diff --git a/doc/whatsnew/fragments/10600.new_check b/doc/whatsnew/fragments/10600.new_check
@@ -1,3 +1,6 @@
-Add :ref:`improve-conditionals` check to the Code Style extension.
+Add ``consider-rewriting-conditional`` check to the Code Style extension to suggest
+``not (x and y)`` instead of ``not x or not y`` in order to facilitate the detection
+of match case refactors. The code style extension must be enabled and
+``consider-rewriting-conditional`` itself needs to be explicitly enabled.
 
 Refs #10600
diff --git a/pylint/extensions/code_style.py b/pylint/extensions/code_style.py
@@ -92,7 +92,7 @@ class CodeStyleChecker(BaseChecker):
         ),
         "R6107": (
             "Rewrite conditional expression to '%s'",
-            "improve-conditionals",
+            "consider-rewriting-conditional",
             "Rewrite negated if expressions to improve readability. This style is simpler "
             "and also permits converting long if/elif chains to match case with more ease.\n"
             "Disabled by default!",
@@ -424,7 +424,7 @@ def _invert_node(node: nodes.NodeNG) -> nodes.NodeNG:
             case _:  # pragma: no cover
                 raise AssertionError
 
-    @only_required_for_messages("improve-conditionals")
+    @only_required_for_messages("consider-rewriting-conditional")
     def visit_boolop(self, node: nodes.BoolOp) -> None:
         if (
             node.op == "or"
@@ -451,7 +451,7 @@ def visit_boolop(self, node: nodes.BoolOp) -> None:
                 new_node.postinit(operand=new_boolop)
 
             self.add_message(
-                "improve-conditionals",
+                "consider-rewriting-conditional",
                 node=target_node,
                 args=(new_node.as_string(),),
                 confidence=HIGH,
diff --git a/pylintrc b/pylintrc
@@ -81,7 +81,7 @@ clear-cache-post-run=no
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once). See also the "--disable" option for examples.
 enable=
-    improve-conditionals,
+    consider-rewriting-conditional,
     use-symbolic-message-instead,
     useless-suppression,
 
diff --git a/tests/functional/ext/code_style/cs_consider_rewriting_conditional.py b/tests/functional/ext/code_style/cs_consider_rewriting_conditional.py
@@ -24,17 +24,18 @@ def f1(expr, node_cls, x, y, z):
     elif not isinstance(expr, node_cls) or x is not None:
         ...
 
-    if not isinstance(expr, node_cls) or expr.attrname != "__init__":  # [improve-conditionals]
+    # +1: [consider-rewriting-conditional]
+    if not isinstance(expr, node_cls) or expr.attrname != "__init__":
         ...
-    elif not x or y not in z:  # [improve-conditionals]
+    elif not x or y not in z:  # [consider-rewriting-conditional]
         ...
-    elif not x or y is not z:  # [improve-conditionals]
+    elif not x or y is not z:  # [consider-rewriting-conditional]
         ...
-    elif not (not x or not y):  # [improve-conditionals]
+    elif not (not x or not y):  # [consider-rewriting-conditional]
         ...
-    elif x and (not y or not z):  # [improve-conditionals]
+    elif x and (not y or not z):  # [consider-rewriting-conditional]
         ...
-    elif not x or y < 0 or z <= 0:  # [improve-conditionals]
+    elif not x or y < 0 or z <= 0:  # [consider-rewriting-conditional]
         ...
-    elif not x or y > 0 or z >= 0:  # [improve-conditionals]
+    elif not x or y > 0 or z >= 0:  # [consider-rewriting-conditional]
         ...
diff --git a/tests/functional/ext/code_style/cs_consider_rewriting_conditional.rc b/tests/functional/ext/code_style/cs_consider_rewriting_conditional.rc
@@ -1,3 +1,3 @@
 [MAIN]
 load-plugins=pylint.extensions.code_style
-enable=improve-conditionals
+enable=consider-rewriting-conditional
diff --git a/tests/functional/ext/code_style/cs_consider_rewriting_conditional.txt b/tests/functional/ext/code_style/cs_consider_rewriting_conditional.txt
@@ -0,0 +1,7 @@
+consider-rewriting-conditional:28:7:28:68:f1:Rewrite conditional expression to 'not (isinstance(expr, node_cls) and expr.attrname == '__init__')':HIGH
+consider-rewriting-conditional:30:9:30:28:f1:Rewrite conditional expression to 'not (x and y in z)':HIGH
+consider-rewriting-conditional:32:9:32:28:f1:Rewrite conditional expression to 'not (x and y is z)':HIGH
+consider-rewriting-conditional:34:9:34:29:f1:Rewrite conditional expression to 'x and y':HIGH
+consider-rewriting-conditional:36:16:36:30:f1:Rewrite conditional expression to 'not (y and z)':HIGH
+consider-rewriting-conditional:38:9:38:33:f1:Rewrite conditional expression to 'not (x and y >= 0 and z > 0)':HIGH
+consider-rewriting-conditional:40:9:40:33:f1:Rewrite conditional expression to 'not (x and y <= 0 and z < 0)':HIGH
diff --git a/tests/functional/ext/code_style/cs_improve_conditionals.txt b/tests/functional/ext/code_style/cs_improve_conditionals.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`def is_penguin(animal):`
`2`	`2`	`# Penguins are the only flightless, kneeless sea birds`
`3`	`3`	`return animal.is_seabird() and (`
`4`		`- not animal.can_fly() or not animal.has_visible_knee() # [improve-conditionals]`
	`4`	`+ # +1: [consider-rewriting-conditional]`
	`5`	`+ not animal.can_fly()`
	`6`	`+ or not animal.has_visible_knee()`
`5`	`7`	`)`