From 54cd5c95d9af7037e1b96a726506ceb5df4f43a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Legan=C3=A9s=20Combarro=20=22Piranna=22?= Date: Sun, 10 Jun 2012 13:52:10 +0200 Subject: Add tabs correctly on identifiers offset --- sqlparse/filters.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'sqlparse') diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 3bd492b..401c436 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -475,9 +475,21 @@ class ReindentFilter: ignore = False for token in identifiers: if not ignore and not token.ttype: - ws = self._gentabs(offset) - tlist.insert_before(token, sql.Token(T.Whitespace, - ws)) + prev = tlist.token_prev(token, False) + if prev and prev.ttype == T.Whitespace: + value = prev.value + + spaces = 0 + while value and value[-1] == ' ': + value = value[:-1] + spaces += 1 + + value += self._gentabs(spaces + offset) + prev.value = value + else: + ws = sql.Token(T.Whitespace, + self._gentabs(offset)) + tlist.insert_before(token, ws) ignore = token.ttype # Decrease offset the size of the first token -- cgit v1.2.1