Keep user inserted optional parentheses

src/black/const.py

@@ -1,4 +1,10 @@
+from enum import Enum
+
 DEFAULT_LINE_LENGTH = 88
 DEFAULT_EXCLUDES = r"/(\.direnv|\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|venv|\.svn|_build|buck-out|build|dist)/"  # noqa: B950
 DEFAULT_INCLUDES = r"\.pyi?$"
 STDIN_PLACEHOLDER = "__BLACK_STDIN_FILENAME__"
+
+
+class Fixer(Enum):
+    HIDE_PARENTHESES = 1

src/black/linegen.py

@@ -26,6 +26,7 @@
 from black.trans import StringSplitter, StringParenWrapper, StringParenStripper
 from black.mode import Mode
 from black.mode import Feature
+from black.const import Fixer
 
 from blib2to3.pytree import Node, Leaf
 from blib2to3.pgen2 import token
@@ -495,7 +496,9 @@ def right_hand_split(
         # there are no standalone comments in the body
         and not body.contains_standalone_comments(0)
         # and we can actually remove the parens
-        and can_omit_invisible_parens(body, line_length, omit_on_explode=omit)
+        and can_omit_invisible_parens(
+            body, line_length, opening_bracket, closing_bracket, omit_on_explode=omit
+        )
     ):
         omit = {id(closing_bracket), *omit}
         try:
@@ -828,6 +831,9 @@ def maybe_make_parens_invisible_in_atom(node: LN, parent: LN) -> bool:
     if first.type == token.LPAR and last.type == token.RPAR:
         middle = node.children[1]
         # make parentheses invisible
+        if first.value == "(" and last.value == ")":
+            first.fixers_applied.append(Fixer.HIDE_PARENTHESES)
+            last.fixers_applied.append(Fixer.HIDE_PARENTHESES)
         first.value = ""  # type: ignore
         last.value = ""  # type: ignore
         maybe_make_parens_invisible_in_atom(middle, parent=parent)

src/black/lines.py

@@ -17,7 +17,8 @@
 from blib2to3.pytree import Node, Leaf
 from blib2to3.pgen2 import token
 
-from black.brackets import BracketTracker, DOT_PRIORITY
+from black.brackets import BracketTracker, DOT_PRIORITY, LOGIC_PRIORITY
+from black.const import Fixer
 from black.mode import Mode
 from black.nodes import STANDALONE_COMMENT, TEST_DESCENDANTS
 from black.nodes import BRACKETS, OPENING_BRACKETS, CLOSING_BRACKETS
@@ -609,6 +610,8 @@ def can_be_split(line: Line) -> bool:
 def can_omit_invisible_parens(
     line: Line,
     line_length: int,
+    opening_bracket: Leaf,
+    closing_bracket: Leaf,
     omit_on_explode: Collection[LeafID] = (),
 ) -> bool:
     """Does `line` have a shape safe to reformat without optional parens around it?
@@ -627,6 +630,16 @@ def can_omit_invisible_parens(
         # With more than one delimiter of a kind the optional parentheses read better.
         return False
 
+    if (
+        max_priority >= LOGIC_PRIORITY
+        and bt.delimiter_count_with_priority(max_priority) > 0
+        and Fixer.HIDE_PARENTHESES in opening_bracket.fixers_applied
+        and Fixer.HIDE_PARENTHESES in closing_bracket.fixers_applied
+    ):
+        # With at least one delimiter of kind LOGIC or above, optional parentheses are better.
+        # So don't remove them if added by user.
+        return False
+
     if max_priority == DOT_PRIORITY:
         # A single stranded method call doesn't require optional parentheses.
         return True

tests/data/trailing_comma_optional_parens2.py

@@ -1,3 +1,3 @@
-if (e123456.get_tk_patchlevel() >= (8, 6, 0, 'final') or
-    (8, 5, 8) <= get_tk_patchlevel() < (8, 6)):
-    pass
+if e123456.get_tk_patchlevel() >= (8, 6, 0, 'final') or \
+    (8, 5, 8) <= get_tk_patchlevel() < (8, 6):
+    pass