Better formatting when using comma-first notation (issue141).

andialbrecht · andialbrecht · commit b8f73564b747 · 2016-09-17T15:35:19.000+02:00
diff --git a/sqlparse/filters/reindent.py b/sqlparse/filters/reindent.py
@@ -43,8 +43,10 @@ def _get_offset(self, token):
         # Now take current offset into account and return relative offset.
         return len(line) - len(self.char * self.leading_ws)
 
-    def nl(self):
-        return sql.Token(T.Whitespace, self.n + self.char * self.leading_ws)
+    def nl(self, offset=0):
+        return sql.Token(
+            T.Whitespace,
+            self.n + self.char * max(0, self.leading_ws + offset))
 
     def _next_token(self, tlist, idx=-1):
         split_words = ('FROM', 'STRAIGHT_JOIN$', 'JOIN$', 'AND', 'OR',
@@ -125,13 +127,15 @@ def _process_identifierlist(self, tlist):
                     # Add 1 for the "," separator
                     position += len(token.value) + 1
                     if position > (self.wrap_after - self.offset):
+                        adjust = 0
                         if self.comma_first:
+                            adjust = -2
                             _, comma = tlist.token_prev(
                                 tlist.token_index(token))
                             if comma is None:
                                 continue
                             token = comma
-                        tlist.insert_before(token, self.nl())
+                        tlist.insert_before(token, self.nl(offset=adjust))
                         if self.comma_first:
                             _, ws = tlist.token_next(
                                 tlist.token_index(token), skip_ws=False)
diff --git a/tests/test_format.py b/tests/test_format.py
@@ -436,12 +436,12 @@ def test_identifier_list_comment_first(self):
         s = 'select foo, bar, baz from table where foo in (1, 2,3)'
         assert f(s) == '\n'.join([
             'select foo',
-            '       , bar',
-            '       , baz',
+            '     , bar',
+            '     , baz',
             'from table',
             'where foo in (1',
-            '              , 2',
-            '              , 3)'])
+            '            , 2',
+            '            , 3)'])
 
     def test_identifier_list_with_functions(self):
         f = lambda sql: sqlparse.format(sql, reindent=True)
