From 8e640722c62692818ab840d50b3758f89a41a54e Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Wed, 25 Nov 2015 16:48:41 -0500
Subject: Imported Upstream version 3.0.7

---
 SQLiteStudio3/coreSQLiteStudio/parser/token.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'SQLiteStudio3/coreSQLiteStudio/parser/token.cpp')

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;
-- 
cgit v1.2.3