From 3d0bdf20c5f558258c08805a3ba546481d29ebac Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Sun, 30 Nov 2014 07:52:00 +0100 Subject: Improved formatting when newline precedes commas in lists (fixes #140). --- sqlparse/filters.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sqlparse') 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) -- cgit v1.2.1