Merge pull request #18 from asottile/unhug_trailing_whitespace

Don't introduce trailing whitespace on blank lines when unhugging

add_trailing_comma.py

@@ -271,7 +271,7 @@ def _fix_brace(fix_data, add_comma, tokens):
         indents = []
         insert_indents = []
         for i in range(first_brace + 3, last_brace):
-            if tokens[i - 1].name == 'NL':
+            if tokens[i - 1].name == 'NL' and tokens[i].name != 'NL':
                 if tokens[i].name != UNIMPORTANT_WS:
                     min_indent = 0
                     insert_indents.append(i)

tests/add_trailing_comma_test.py

@@ -473,6 +473,22 @@ def test_noop_unhugs(src):
             '    "bar"\n'
             ')',
         ),
+        # Regression test for #17
+        (
+            'x("foo", (\n'
+            '    "bar",\n'
+            '\n'
+            '    "baz",\n'
+            '))',
+
+            'x(\n'
+            '    "foo", (\n'
+            '        "bar",\n'
+            '\n'
+            '        "baz",\n'
+            '    ),\n'
+            ')',
+        ),
     ),
 )
 def test_fix_unhugs(src, expected):