Fix issue with type comments on lines with trailing commas (#1058)

The code introduced in #1027 to detect whether a type comment appeared
after a regular comment in a Line would spuriously misfire when a leaf
was in the comments dict but had an empty list of comments. This can
occur as an artifact of how comments on trailing commas are handled,
it seems.

(This was discovered trying to test black out on mypy.)

diff --git a/black.py b/black.py
index f283ffc99b3a50d1e6b225c0a93714c67247fd35..d8aa3562d8fe968c43a4de7f4ab407de1bf66a7d 100644 (file)
--- a/black.py
+++ b/black.py
@@ -1321,7 +1321,7 @@ class Line:
                     if leaf_id not in ignored_ids or comment_seen:
                         return True
 
                     if leaf_id not in ignored_ids or comment_seen:
                         return True
 

-            comment_seen = True
+                comment_seen = True

 
         return False
 
 
         return False
 

diff --git a/tests/data/comments2.py b/tests/data/comments2.py
index 54b7b0018c9390f0995afa8e481c394a1b706ad7..248552c12aa565484e3daf8156f395d56fdf044a 100644 (file)
--- a/tests/data/comments2.py
+++ b/tests/data/comments2.py
@@ -146,6 +146,7 @@ short
         ],
     )
 
         ],
     )
 

+CONFIG_FILES = [CONFIG_FILE, ] + SHARED_CONFIG_FILES + USER_CONFIG_FILES  # type: Final

 
 #######################
 ### SECTION COMMENT ###
 
 #######################
 ### SECTION COMMENT ###


@@ -313,6 +314,8 @@ short
     )
 
 
     )
 
 

+CONFIG_FILES = [CONFIG_FILE] + SHARED_CONFIG_FILES + USER_CONFIG_FILES  # type: Final
+

 #######################
 ### SECTION COMMENT ###
 #######################
 #######################
 ### SECTION COMMENT ###
 #######################