Merge 265d946 into d9e71a7

psf · Oct 10, 2019 · c307c9a · c307c9a
2 parents d9e71a7 + 265d946
commit c307c9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/black.py b/black.py
@@ -1321,7 +1321,7 @@ def contains_uncollapsable_type_comments(self) -> bool:
                     if leaf_id not in ignored_ids or comment_seen:
                         return True
 
-            comment_seen = True
+                comment_seen = True
 
         return False
 

diff --git a/tests/data/comments2.py b/tests/data/comments2.py
@@ -146,6 +146,7 @@ def inline_comments_in_brackets_ruin_everything():
         ],
     )
 
+CONFIG_FILES = [CONFIG_FILE, ] + SHARED_CONFIG_FILES + USER_CONFIG_FILES  # type: Final
 
 #######################
 ### SECTION COMMENT ###
@@ -313,6 +314,8 @@ def inline_comments_in_brackets_ruin_everything():
     )
 
 
+CONFIG_FILES = [CONFIG_FILE] + SHARED_CONFIG_FILES + USER_CONFIG_FILES  # type: Final
+
 #######################
 ### SECTION COMMENT ###
 #######################