Imported Upstream version 3.0.7upstream/3.0.7

1 files changed, 4 insertions, 4 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
index d3e05f1..f2102c3 100644
--- a/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/parser/token.cpp
@@ -140,9 +140,9 @@ Range Token::getRange()
     return Range(start, end);
 }
 
-bool Token::isWhitespace() const
+bool Token::isWhitespace(bool includeComments) const
 {
-    return (type == SPACE || type == COMMENT);
+    return (type == SPACE || (includeComments && type == COMMENT));
 }
 
 bool Token::isSeparating() const
@@ -490,11 +490,11 @@ TokenList TokenList::filter(Token::Type type) const
     return filtered;
 }
 
-TokenList TokenList::filterWhiteSpaces() const
+TokenList TokenList::filterWhiteSpaces(bool includeComments) const
 {
     TokenList filtered;
     foreach (TokenPtr token, *this)
-        if (!token->isWhitespace())
+        if (!token->isWhitespace(includeComments))
             filtered << token;
 
     return filtered;