actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash with long type annotations (#1093)

Browse Source
This commit is contained in:
Jelle Zijlstra 2019-10-27 04:31:10 -07:00 committed by Zsolt Dollenstein
parent d10b56e6f7
commit 53808e3902
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
black.py
View File

@ -2601,9 +2601,11 @@ def bracket_split_build_line(
# Since body is a new indent level, remove spurious leading whitespace. # Since body is a new indent level, remove spurious leading whitespace.
normalize_prefix(leaves[0], inside_brackets=True) normalize_prefix(leaves[0], inside_brackets=True)
# Ensure a trailing comma for imports and standalone function arguments, but # Ensure a trailing comma for imports and standalone function arguments, but
# be careful not to add one after any comments. # be careful not to add one after any comments or within type annotations.
no_commas = original.is_def and not any( no_commas = (
l.type == token.COMMA for l in leaves original.is_def
and opening_bracket.value == "("
and not any(l.type == token.COMMA for l in leaves)
) )
if original.is_import or no_commas: if original.is_import or no_commas:

11
tests/data/function_trailing_comma.py
View File

@ -4,6 +4,11 @@ def f(a,):
def f(a:int=1,): def f(a:int=1,):
... ...
def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
]:
pass
# output # output
def f(a,): def f(a,):
@ -12,3 +17,9 @@ def f(a,):
def f(a: int = 1,): def f(a: int = 1,):
... ...
def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
]:
pass