Do not omit any tokens when selecting the last two leaves

src/black/__init__.py

@@ -6608,7 +6608,7 @@ def can_omit_invisible_parens(
     last = line.leaves[-1]
     if line.should_explode:
         try:
-            penultimate, last = last_two_except(line.leaves, omit=omit_on_explode)
+            penultimate, last = last_two_except(line.leaves)
         except LookupError:
             # Turns out we'd omit everything.  We cannot skip the optional parentheses.
             return False
@@ -6685,7 +6685,7 @@ def _can_omit_closing_paren(line: Line, *, last: Leaf, line_length: int) -> bool
     return False
 
 
-def last_two_except(leaves: List[Leaf], omit: Collection[LeafID]) -> Tuple[Leaf, Leaf]:
+def last_two_except(leaves: List[Leaf]) -> Tuple[Leaf, Leaf]:
     """Return (penultimate, last) leaves skipping brackets in `omit` and contents."""
     stop_after = None
     last = None
@@ -6698,10 +6698,7 @@ def last_two_except(leaves: List[Leaf], omit: Collection[LeafID]) -> Tuple[Leaf,
         if last:
             return leaf, last
 
-        if id(leaf) in omit:
-            stop_after = leaf.opening_bracket
-        else:
-            last = leaf
+        last = leaf
     else:
         raise LookupError("Last two leaves were also skipped")
 

tests/test_black.py

@@ -239,14 +239,12 @@ def test_invisible_parens_instability(self) -> None:
         actual = fs(source)
         black.assert_stable(source, actual, DEFAULT_MODE)
 
-    @unittest.expectedFailure
     @patch("black.dump_to_file", dump_to_stderr)
     def test_trailing_comma_optional_parens_stability1(self) -> None:
         source, _expected = read_data("trailing_comma_optional_parens1")
         actual = fs(source)
         black.assert_stable(source, actual, DEFAULT_MODE)
 
-    @unittest.expectedFailure
     @patch("black.dump_to_file", dump_to_stderr)
     def test_trailing_comma_optional_parens_stability2(self) -> None:
         source, _expected = read_data("trailing_comma_optional_parens2")