From: Ɓukasz Langa Date: Wed, 26 Sep 2018 15:53:56 +0000 (-0700) Subject: Move should_explode handling to bracket_split_build_line X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/a4b5c085a30f32fddce46ed50f3378ef32c43d5d?hp=1610fd6bc5d594c4f27698825913d2f791d3ea02 Move should_explode handling to bracket_split_build_line --- diff --git a/black.py b/black.py index 2eefe11..692f6d5 100644 --- a/black.py +++ b/black.py @@ -2191,9 +2191,12 @@ def left_hand_split(line: Line, py36: bool = False) -> Iterator[Line]: if leaf.type in OPENING_BRACKETS: matching_bracket = leaf current_leaves = body_leaves - head = bracket_split_build_line(head_leaves, line) - body = bracket_split_build_line(body_leaves, line, is_body=True) - tail = bracket_split_build_line(tail_leaves, line) + if not matching_bracket: + raise CannotSplit("No brackets found") + + head = bracket_split_build_line(head_leaves, line, matching_bracket) + body = bracket_split_build_line(body_leaves, line, matching_bracket, is_body=True) + tail = bracket_split_build_line(tail_leaves, line, matching_bracket) bracket_split_succeeded_or_raise(head, body, tail) for result in (head, body, tail): if result: @@ -2236,10 +2239,9 @@ def right_hand_split( tail_leaves.reverse() body_leaves.reverse() head_leaves.reverse() - head = bracket_split_build_line(head_leaves, line) - body = bracket_split_build_line(body_leaves, line, is_body=True) - tail = bracket_split_build_line(tail_leaves, line) - body.should_explode = should_explode(body, opening_bracket) + head = bracket_split_build_line(head_leaves, line, opening_bracket) + body = bracket_split_build_line(body_leaves, line, opening_bracket, is_body=True) + tail = bracket_split_build_line(tail_leaves, line, opening_bracket) bracket_split_succeeded_or_raise(head, body, tail) if ( # the body shouldn't be exploded @@ -2314,7 +2316,7 @@ def bracket_split_succeeded_or_raise(head: Line, body: Line, tail: Line) -> None def bracket_split_build_line( - leaves: List[Leaf], original: Line, *, is_body: bool = False + leaves: List[Leaf], original: Line, opening_bracket: Leaf, *, is_body: bool = False ) -> Line: """Return a new line with given `leaves` and respective comments from `original`. @@ -2337,6 +2339,8 @@ def bracket_split_build_line( result.append(leaf, preformatted=True) for comment_after in original.comments_after(leaf): result.append(comment_after, preformatted=True) + if is_body: + result.should_explode = should_explode(result, opening_bracket) return result