Rewrite mostly useless assert in test_trans.py (#3810)

[etc/vim.git] / src / black / brackets.py

diff --git a/src/black/brackets.py b/src/black/brackets.py
index 0a5317f6773efb7a002cea03288d8c43a632b3ca..85dac6edd1eaa1e86a7c4f08f09d8a7aec4752dc 100644 (file)
--- a/src/black/brackets.py
+++ b/src/black/brackets.py
@@ -1,13 +1,7 @@
 """Builds on top of nodes.py to track brackets."""
 
 """Builds on top of nodes.py to track brackets."""
 

-import sys

 from dataclasses import dataclass, field
 from dataclasses import dataclass, field

-from typing import Dict, Iterable, List, Optional, Sequence, Set, Tuple, Union
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
+from typing import Dict, Final, Iterable, List, Optional, Sequence, Set, Tuple, Union

 
 from black.nodes import (
     BRACKET,
 
 from black.nodes import (
     BRACKET,


@@ -80,9 +74,12 @@ class BracketTracker:
         within brackets a given leaf is. 0 means there are no enclosing brackets
         that started on this line.
 
         within brackets a given leaf is. 0 means there are no enclosing brackets
         that started on this line.
 

-        If a leaf is itself a closing bracket, it receives an `opening_bracket`
-        field that it forms a pair with. This is a one-directional link to
-        avoid reference cycles.
+        If a leaf is itself a closing bracket and there is a matching opening
+        bracket earlier, it receives an `opening_bracket` field with which it forms a
+        pair. This is a one-directional link to avoid reference cycles. Closing
+        bracket without opening happens on lines continued from previous
+        breaks, e.g. `) -> "ReturnType":` as part of a funcdef where we place
+        the return type annotation on its own line of the previous closing RPAR.

 
         If a leaf is a delimiter (a token on which Black can split the line if
         needed) and it's on depth 0, its `id()` is stored in the tracker's
 
         If a leaf is a delimiter (a token on which Black can split the line if
         needed) and it's on depth 0, its `id()` is stored in the tracker's


@@ -91,6 +88,13 @@ class BracketTracker:
         if leaf.type == token.COMMENT:
             return
 
         if leaf.type == token.COMMENT:
             return
 

+        if (
+            self.depth == 0
+            and leaf.type in CLOSING_BRACKETS
+            and (self.depth, leaf.type) not in self.bracket_match
+        ):
+            return
+

         self.maybe_decrement_after_for_loop_variable(leaf)
         self.maybe_decrement_after_lambda_arguments(leaf)
         if leaf.type in CLOSING_BRACKETS:
         self.maybe_decrement_after_for_loop_variable(leaf)
         self.maybe_decrement_after_lambda_arguments(leaf)
         if leaf.type in CLOSING_BRACKETS:


@@ -349,26 +353,23 @@ def get_leaves_inside_matching_brackets(leaves: Sequence[Leaf]) -> Set[LeafID]:
     Matching brackets are included.
     """
     try:
     Matching brackets are included.
     """
     try:

-        # Only track brackets from the first opening bracket to the last closing
-        # bracket.
+        # Start with the first opening bracket and ignore closing brackets before.

         start_index = next(
             i for i, l in enumerate(leaves) if l.type in OPENING_BRACKETS
         )
         start_index = next(
             i for i, l in enumerate(leaves) if l.type in OPENING_BRACKETS
         )

-        end_index = next(
-            len(leaves) - i
-            for i, l in enumerate(reversed(leaves))
-            if l.type in CLOSING_BRACKETS
-        )

     except StopIteration:
         return set()
     except StopIteration:
         return set()

+    bracket_stack = []

     ids = set()
     ids = set()

-    depth = 0
-    for i in range(end_index, start_index - 1, -1):
+    for i in range(start_index, len(leaves)):

         leaf = leaves[i]
         leaf = leaves[i]

-        if leaf.type in CLOSING_BRACKETS:
-            depth += 1
-        if depth > 0:
-            ids.add(id(leaf))

         if leaf.type in OPENING_BRACKETS:
         if leaf.type in OPENING_BRACKETS:

-            depth -= 1
+            bracket_stack.append((BRACKET[leaf.type], i))
+        if leaf.type in CLOSING_BRACKETS:
+            if bracket_stack and leaf.type == bracket_stack[-1][0]:
+                _, start = bracket_stack.pop()
+                for j in range(start, i + 1):
+                    ids.add(id(leaves[j]))
+            else:
+                break

     return ids
     return ids