diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | sqlparse/filters.py | 14 |
2 files changed, 17 insertions, 0 deletions
@@ -7,6 +7,9 @@ Bug Fixes by aadis). * Fix indentation when using tabs (issue146). +Enhancements +* Improved formatting in list when newlines precede commas (issue140). + Release 0.1.13 (Oct 09, 2014) ----------------------------- diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 4a0b2c7..e576a26 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -246,6 +246,20 @@ class StripWhitespaceFilter: token.value = ' ' last_was_ws = token.is_whitespace() + def _stripws_identifierlist(self, tlist): + # Removes newlines before commas, see issue140 + last_nl = None + for token in tlist.tokens[:]: + if (token.ttype is T.Punctuation + and token.value == ',' + and last_nl is not None): + tlist.tokens.remove(last_nl) + if token.is_whitespace(): + last_nl = token + else: + last_nl = None + return self._stripws_default(tlist) + def _stripws_parenthesis(self, tlist): if tlist.tokens[1].is_whitespace(): tlist.tokens.pop(1) |