Fix false positive for superfluous-parens for `return (a or b) in i…

…terable` (#5964)

Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com>

ChangeLog

@@ -20,6 +20,10 @@ What's New in Pylint 2.13.2?
 ============================
 Release date: TBA
 
+* Fix false positive for ``superfluous-parens`` for patterns like
+  "return (a or b) in iterable".
+
+  Closes #5803
 
 
 What's New in Pylint 2.13.1?

doc/whatsnew/2.13.rst

@@ -557,3 +557,8 @@ Other Changes
   the variable being raised.
 
   Closes #2793
+
+* Fix false positive for ``superfluous-parens`` for patterns like
+  "return (a or b) in iterable".
+
+  Closes #5803

pylint/checkers/format.py

@@ -320,6 +320,7 @@ def new_line(self, tokens, line_end, line_start):
     def process_module(self, _node: nodes.Module) -> None:
         pass
 
+    # pylint: disable-next=too-many-return-statements
     def _check_keyword_parentheses(
         self, tokens: List[tokenize.TokenInfo], start: int
     ) -> None:
@@ -382,19 +383,15 @@ def _check_keyword_parentheses(
                     # The empty tuple () is always accepted.
                     if i == start + 2:
                         return
-                    if keyword_token == "not":
-                        if not found_and_or:
-                            self.add_message(
-                                "superfluous-parens", line=line_num, args=keyword_token
-                            )
-                    elif keyword_token in {"return", "yield"}:
-                        self.add_message(
-                            "superfluous-parens", line=line_num, args=keyword_token
-                        )
-                    elif not found_and_or and keyword_token != "in":
-                        self.add_message(
-                            "superfluous-parens", line=line_num, args=keyword_token
-                        )
+                    if found_and_or:
+                        return
+                    if keyword_token == "in":
+                        # This special case was added in https://github.com/PyCQA/pylint/pull/4948
+                        # but it could be removed in the future. Avoid churn for now.
+                        return
+                    self.add_message(
+                        "superfluous-parens", line=line_num, args=keyword_token
+                    )
                 return
             elif depth == 1:
                 # This is a tuple, which is always acceptable.

tests/functional/s/superfluous_parens.py

@@ -44,8 +44,11 @@ def function_A():
 def function_B(var):
     return (var.startswith(('A', 'B', 'C')) or var == 'D')
 
+def function_C(first, second):
+    return (first or second) in (0, 1)
+
 # TODO: Test string combinations, see https://github.com/PyCQA/pylint/issues/4792
-# Lines 45, 46 & 47 should raise the superfluous-parens message
+# The lines with "+" should raise the superfluous-parens message
 J = "TestString"
 K = ("Test " + "String")
 L = ("Test " + "String") in I