From a733067d9cb04140f77e3a0a53cc54960e1e17bf Mon Sep 17 00:00:00 2001 From: Yilei Yang Date: Fri, 16 Jun 2023 09:23:20 -0700 Subject: [PATCH] Cherry pick https://github.com/psf/black/pull/3735. Why not rebase? Black has unreleased changes in blib2to3, rebasing will make Pyink releases harder. Will wait for a new Black release before we rebase. PiperOrigin-RevId: 540903043 --- src/pyink/linegen.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pyink/linegen.py b/src/pyink/linegen.py index 76a2e4f78e2..b9a998d33ea 100644 --- a/src/pyink/linegen.py +++ b/src/pyink/linegen.py @@ -1008,6 +1008,13 @@ def bracket_split_build_line( ) if isinstance(node, Node) and isinstance(node.prev_sibling, Leaf) ) + # Except the false negatives above for PEP 604 unions where we + # can't add the comma. + and not ( + leaves[0].parent + and leaves[0].parent.next_sibling + and leaves[0].parent.next_sibling.type == token.VBAR + ) ) if original.is_import or no_commas: