Don't insert trailing commas after standalone comments

diff --git a/black.py b/black.py
index c2c118a4883c979d68439ef2636534d1c952a5a1..87e023157a0419480c6098482c9d3636eedf893f 100644 (file)
--- a/black.py
+++ b/black.py
@@ -1796,9 +1796,10 @@ def delimiter_split(line: Line, py36: bool = False) -> Iterator[Line]:
             current_line = Line(depth=line.depth, inside_brackets=line.inside_brackets)
     if current_line:
         if (
-            delimiter_priority == COMMA_PRIORITY
+            trailing_comma_safe
+            and delimiter_priority == COMMA_PRIORITY
             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, ","))
         yield current_line

diff --git a/tests/function.py b/tests/function.py
index 007cc98ace10238fbf44d93832f944817c1f4a57..584474c1bb9b53c44cd7f0d2ad72694d8f7f8e45 100644 (file)
--- a/tests/function.py
+++ b/tests/function.py
@@ -47,6 +47,12 @@ def long_lines():
         typedargslist.extend(
             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(
         r"""
         ^
@@ -161,6 +167,15 @@ def long_lines():
                 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(
         r"""
         ^