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

Don't insert trailing commas after standalone comments

Browse Source
This commit is contained in:
Łukasz Langa 2018-03-31 23:32:11 -07:00
parent fcaaf955be
commit 4787294622
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
black.py
View File

@ -1796,9 +1796,10 @@ def append_to_line(leaf: Leaf) -> Iterator[Line]:
current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets) current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets)
if current_line: if current_line:
if ( if (
delimiter_priority == COMMA_PRIORITY trailing_comma_safe
and delimiter_priority == COMMA_PRIORITY
and current_line.leaves[-1].type != token.COMMA and current_line.leaves[-1].type != token.COMMA
and trailing_comma_safe and current_line.leaves[-1].type != STANDALONE_COMMENT
): ):
current_line.append(Leaf(token.COMMA, ",")) current_line.append(Leaf(token.COMMA, ","))
yield current_line yield current_line

15
tests/function.py
View File

@ -47,6 +47,12 @@ def long_lines():
typedargslist.extend( typedargslist.extend(
gen_annotated_params(ast_args.kwonlyargs, ast_args.kw_defaults, parameters, implicit_default=True) gen_annotated_params(ast_args.kwonlyargs, ast_args.kw_defaults, parameters, implicit_default=True)
) )
typedargslist.extend(
gen_annotated_params(
ast_args.kwonlyargs, ast_args.kw_defaults, parameters, implicit_default=True,
# trailing standalone comment
)
)
_type_comment_re = re.compile( _type_comment_re = re.compile(
r""" r"""
^ ^
@ -161,6 +167,15 @@ def long_lines():
implicit_default=True, implicit_default=True,
) )
) )
typedargslist.extend(
gen_annotated_params(
ast_args.kwonlyargs,
ast_args.kw_defaults,
parameters,
implicit_default=True,
# trailing standalone comment
)
)
_type_comment_re = re.compile( _type_comment_re = re.compile(
r""" r"""
^ ^