fix: WPS222 false positive for nested conditions (#3633)

Author: vldmrdev

CHANGELOG.md

@@ -16,6 +16,12 @@ Semantic versioning in our case means:
   But, in the future we might change the configuration names/logic,
   change the client facing API, change code conventions significantly, etc.
 
+## WIP
+
+### Bugfixes
+
+- Fixes the false positive `WPS222` for nested conditions, #3630
+
 
 ## 1.6.1
 

tests/test_visitors/test_ast/test_complexity/test_counts/test_condition_counts.py

@@ -45,33 +45,48 @@
     print(1)
 """
 
+# 3 conditions, nested conditions are not counted.
+if_with_nested_conditions = """
+if (a is None or (func1(a) and b) or (func2(a) and c)):
+    ...
+"""
+
 # Real examples:
 
 complex_assignment = """
-some = zero and first or (second and last) or default()
+some = zero and first or (second and last) or default() or c or d
 """
 
 complex_condition = """
-if x == x1 and y == y1 and z == z1 or v == v1 or last():
+if x == x1 and y == y1 and z == z1 or v == v1 or last() or to_be() \
+    or not_to_be():
     ...
 """
 
+complex_list_comprehension = """
+def example(x, y):
+    return [i for i in range(x) if i % 2 == 0 or i == y or i > 10 or \
+        y < 4 or i != 0]
+"""
+
 complex_while = """
-while (x > x1 or y < y1) or (small(z) and v) or last():
+while (x > x1 or y < y1) or (small(z) and v) or first() or second() or last():
     ...
 """
 
 complex_match = """
 match some:
-    case 1 if (x > x1 or y < y1) or (small(z) and v) or last():
+    case 1 if (x > x1 or y < y1) or (small(z) and v) or first() or \
+        second() or last():
         ...
 """
 
 complex_gen_exp = """
 (
     ...
     for name in []
-    if (x > x1 or y < y1) or (small(z) and v) or last()
+    if (x > x1 or y < y1) or (small(z) and v) or (b() and g()) or \
+        second() or last()
 )
 """
 
@@ -89,6 +104,7 @@
         condition_with_inline_for,
         condition_with_simple_inline_for,
         while_with_condition,
+        if_with_nested_conditions,
     ],
 )
 def test_module_condition_counts_normal(
@@ -111,6 +127,7 @@ def test_module_condition_counts_normal(
     [
         complex_assignment,
         complex_condition,
+        complex_list_comprehension,
         complex_while,
         complex_match,
         complex_gen_exp,
@@ -138,6 +155,7 @@ def test_module_condition_real_config(
     [
         complex_assignment,
         complex_condition,
+        complex_list_comprehension,
         complex_while,
         complex_match,
         complex_gen_exp,

wemake_python_styleguide/violations/complexity.py

@@ -693,6 +693,8 @@ class TooManyConditionsViolation(ASTViolation):
     .. versionchanged:: 0.5.0
     .. versionchanged:: 1.4.0
         Added ``--max-conditions`` configuration options.
+    .. versionchanged:: 1.7.0
+        Stopped recursive counting of nested ``ast.BoolOp`` nodes.
     """
 
     error_template = 'Found a condition with too much logic: {0}'

wemake_python_styleguide/visitors/ast/complexity/counts.py

@@ -91,13 +91,7 @@ def visit_Compare(self, node: ast.Compare) -> None:
         self.generic_visit(node)
 
     def _count_conditions(self, node: ast.BoolOp) -> int:
-        counter = 0
-        for condition in node.values:
-            if isinstance(condition, ast.BoolOp):
-                counter += self._count_conditions(condition)
-            else:
-                counter += 1
-        return counter
+        return len(node.values)
 
     def _check_conditions(self, node: ast.BoolOp) -> None:
         conditions_count = self._count_conditions(node)