8a59528c2d
This fixes a bug where a trailing comma would be added to a
parenthesized return annotation changing its type to a tuple.
Here's one case where this bug shows up:
```
def spam() -> (
this_is_a_long_type_annotation_which_should_NOT_get_a_trailing_comma
):
pass
```
The root problem was that the type annotation was treated as if it was
a parameter & import list (is_body=True to linegen::bracket_split_build_line)
where a trailing comma is usually fine. Now there's another check in the
aforementioned function to make sure the body it's operating on isn't
a return annotation before truly adding a trailing comma.
151 lines
2.9 KiB
Python
151 lines
2.9 KiB
Python
def f(a,):
|
|
d = {'key': 'value',}
|
|
tup = (1,)
|
|
|
|
def f2(a,b,):
|
|
d = {'key': 'value', 'key2': 'value2',}
|
|
tup = (1,2,)
|
|
|
|
def f(a:int=1,):
|
|
call(arg={'explode': 'this',})
|
|
call2(arg=[1,2,3],)
|
|
x = {
|
|
"a": 1,
|
|
"b": 2,
|
|
}["a"]
|
|
if a == {"a": 1,"b": 2,"c": 3,"d": 4,"e": 5,"f": 6,"g": 7,"h": 8,}["a"]:
|
|
pass
|
|
|
|
def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
|
|
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
|
]:
|
|
json = {"k": {"k2": {"k3": [1,]}}}
|
|
|
|
|
|
|
|
# The type annotation shouldn't get a trailing comma since that would change its type.
|
|
# Relevant bug report: https://github.com/psf/black/issues/2381.
|
|
def some_function_with_a_really_long_name() -> (
|
|
returning_a_deeply_nested_import_of_a_type_i_suppose
|
|
):
|
|
pass
|
|
|
|
|
|
def some_method_with_a_really_long_name(very_long_parameter_so_yeah: str, another_long_parameter: int) -> (
|
|
another_case_of_returning_a_deeply_nested_import_of_a_type_i_suppose_cause_why_not
|
|
):
|
|
pass
|
|
|
|
|
|
def func() -> (
|
|
also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(this_shouldn_t_get_a_trailing_comma_too)
|
|
):
|
|
pass
|
|
|
|
|
|
def func() -> ((also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
|
|
this_shouldn_t_get_a_trailing_comma_too
|
|
))
|
|
):
|
|
pass
|
|
|
|
# output
|
|
|
|
def f(
|
|
a,
|
|
):
|
|
d = {
|
|
"key": "value",
|
|
}
|
|
tup = (1,)
|
|
|
|
|
|
def f2(
|
|
a,
|
|
b,
|
|
):
|
|
d = {
|
|
"key": "value",
|
|
"key2": "value2",
|
|
}
|
|
tup = (
|
|
1,
|
|
2,
|
|
)
|
|
|
|
|
|
def f(
|
|
a: int = 1,
|
|
):
|
|
call(
|
|
arg={
|
|
"explode": "this",
|
|
}
|
|
)
|
|
call2(
|
|
arg=[1, 2, 3],
|
|
)
|
|
x = {
|
|
"a": 1,
|
|
"b": 2,
|
|
}["a"]
|
|
if a == {
|
|
"a": 1,
|
|
"b": 2,
|
|
"c": 3,
|
|
"d": 4,
|
|
"e": 5,
|
|
"f": 6,
|
|
"g": 7,
|
|
"h": 8,
|
|
}["a"]:
|
|
pass
|
|
|
|
|
|
def xxxxxxxxxxxxxxxxxxxxxxxxxxxx() -> Set[
|
|
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
|
]:
|
|
json = {
|
|
"k": {
|
|
"k2": {
|
|
"k3": [
|
|
1,
|
|
]
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
# The type annotation shouldn't get a trailing comma since that would change its type.
|
|
# Relevant bug report: https://github.com/psf/black/issues/2381.
|
|
def some_function_with_a_really_long_name() -> (
|
|
returning_a_deeply_nested_import_of_a_type_i_suppose
|
|
):
|
|
pass
|
|
|
|
|
|
def some_method_with_a_really_long_name(
|
|
very_long_parameter_so_yeah: str, another_long_parameter: int
|
|
) -> (
|
|
another_case_of_returning_a_deeply_nested_import_of_a_type_i_suppose_cause_why_not
|
|
):
|
|
pass
|
|
|
|
|
|
def func() -> (
|
|
also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
|
|
this_shouldn_t_get_a_trailing_comma_too
|
|
)
|
|
):
|
|
pass
|
|
|
|
|
|
def func() -> (
|
|
(
|
|
also_super_long_type_annotation_that_may_cause_an_AST_related_crash_in_black(
|
|
this_shouldn_t_get_a_trailing_comma_too
|
|
)
|
|
)
|
|
):
|
|
pass
|