From d2f1db8457601c7912ac19c3052602f134a87e67 Mon Sep 17 00:00:00 2001
From: Martin Kleusberg <mkleusberg@gmail.com>
Date: Thu, 16 May 2013 21:05:06 +0200
Subject: [PATCH] SyntaxHighlighter: Make keyword list a bit easier to read

---
 src/SQLiteSyntaxHighlighter.cpp | 68 +++++++++++++--------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

diff --git a/src/SQLiteSyntaxHighlighter.cpp b/src/SQLiteSyntaxHighlighter.cpp
index c6492828..629adfa9 100644
--- a/src/SQLiteSyntaxHighlighter.cpp
+++ b/src/SQLiteSyntaxHighlighter.cpp
@@ -14,50 +14,34 @@ SQLiteSyntaxHighlighter::SQLiteSyntaxHighlighter(QTextDocument *parent) :
 
     QStringList keywordPatterns;
     keywordPatterns
-            << "\\bREINDEX\\b" << "\\bINDEXED\\b" << "\\bINDEX\\b"
-            << "\\bDESC\\b" << "\\bESCAPE\\b" << "\\bEACH\\b"
-            << "\\bCHECK\\b" << "\\bKEY\\b" << "\\bBEFORE\\b"
-            << "\\bFOREIGN\\b" << "\\bFOR\\b" << "\\bIGNORE\\b"
-            << "\\bREGEXP\\b" << "\\bEXPLAIN\\b" << "\\bINSTEAD\\b"
-            << "\\bADD\\b" << "\\bDATABASE\\b" << "\\bAS\\b"
-            << "\\bSELECT\\b" << "\\bTABLE\\b" << "\\bLEFT\\b"
-            << "\\bTHEN\\b" << "\\bEND\\b" << "\\bDEFERRABLE\\b"
-            << "\\bELSE\\b" << "\\bEXCEPT\\b" << "\\bTRANSACTION\\b"
-            << "\\bACTION\\b" << "\\bON\\b" << "\\bNATURAL\\b"
-            << "\\bALTER\\b" << "\\bRAISE\\b" << "\\bEXCLUSIVE\\b"
-            << "\\bEXISTS\\b" << "\\bSAVEPOINT\\b" << "\\bINTERSECT\\b"
-            << "\\bTRIGGER\\b" << "\\bREFERENCES\\b" << "\\bCONSTRAINT\\b"
-            << "\\bINTO\\b" << "\\bOFFSET\\b" << "\\bOF\\b"
-            << "\\bSET\\b" << "\\bTEMPORARY\\b" << "\\bTEMP\\b"
-            << "\\bOR\\b" << "\\bUNIQUE\\b" << "\\bQUERY\\b"
-            << "\\bATTACH\\b" << "\\bHAVING\\b" << "\\bGROUP\\b"
-            << "\\bUPDATE\\b" << "\\bBEGIN\\b" << "\\bINNER\\b"
-            << "\\bRELEASE\\b" << "\\bBETWEEN\\b" << "\\bNOTNULL\\b"
-            << "\\bNOT\\b" << "\\bNO\\b" << "\\bNULL\\b"
-            << "\\bLIKE\\b" << "\\bCASCADE\\b" << "\\bASC\\b"
-            << "\\bDELETE\\b" << "\\bCASE\\b" << "\\bCOLLATE\\b"
-            << "\\bCREATE\\b" << "\\bCURRENT_DATE\\b" << "\\bDETACH\\b"
-            << "\\bIMMEDIATE\\b" << "\\bJOIN\\b" << "\\bINSERT\\b"
-            << "\\bMATCH\\b" << "\\bPLAN\\b" << "\\bANALYZE\\b"
-            << "\\bPRAGMA\\b" << "\\bABORT\\b" << "\\bVALUES\\b"
-            << "\\bVIRTUAL\\b" << "\\bLIMIT\\b" << "\\bWHEN\\b"
-            << "\\bWHERE\\b" << "\\bRENAME\\b" << "\\bAFTER\\b"
-            << "\\bREPLACE\\b" << "\\bAND\\b" << "\\bDEFAULT\\b"
-            << "\\bAUTOINCREMENT\\b" << "\\bTO\\b" << "\\bIN\\b"
-            << "\\bCAST\\b" << "\\bCOLUMN\\b" << "\\bCOMMIT\\b"
-            << "\\bCONFLICT\\b" << "\\bCROSS\\b" << "\\bCURRENT_TIMESTAMP\\b"
-            << "\\bCURRENT_TIME\\b" << "\\bPRIMARY\\b" << "\\bDEFERRED\\b"
-            << "\\bDISTINCT\\b" << "\\bIS\\b"  << "\\bDROP\\b"
-            << "\\bFAIL\\b" << "\\bFROM\\b" << "\\bFULL\\b"
-            << "\\bGLOB\\b" << "\\bBY\\b" << "\\bIF\\b"
-            << "\\bISNULL\\b" << "\\bORDER\\b" << "\\bRESTRICT\\b"
-            << "\\bOUTER\\b" << "\\bRIGHT\\b" << "\\bROLLBACK\\b"
-            << "\\bROW\\b" << "\\bUNION\\b"
-            << "\\bUSING\\b" << "\\bVACUUM\\b" << "\\bVIEW\\b"
-            << "\\bINITIALLY\\b" << "\\bALL\\b" << "\\bSELECT\\b";
+            << "ABORT" << "ACTION" << "ADD" << "AFTER" << "ALL"
+            << "ALTER" << "ANALYZE" << "AND" << "AS" << "ASC"
+            << "ATTACH" << "AUTOINCREMENT" << "BEFORE" << "BEGIN" << "BETWEEN"
+            << "BY" << "CASCADE" << "CASE" << "CAST" << "CHECK"
+            << "COLLATE" << "COLUMN" << "COMMIT" << "CONFLICT" << "CONSTRAINT"
+            << "CREATE" << "CROSS" << "CURRENT_DATE" << "CURRENT_TIME" << "CURRENT_TIMESTAMP"
+            << "DATABASE" << "DEFAULT" << "DEFERRABLE" << "DEFERRED" << "DELETE"
+            << "DESC" << "DETACH" << "DISTINCT" << "DROP" << "EACH"
+            << "ELSE" << "END" << "ESCAPE" << "EXCEPT" << "EXCLUSIVE"
+            << "EXISTS" << "EXPLAIN" << "FAIL" << "FOR" << "FOREIGN"
+            << "FROM" << "FULL" << "GLOB" << "GROUP" << "HAVING"
+            << "IF" << "IGNORE" << "IMMEDIATE" << "IN" << "INDEX"
+            << "INDEXED" << "INITIALLY" << "INNER" << "INSERT" << "INSTEAD"
+            << "INTERSECT" << "INTO" << "IS" << "ISNULL" << "JOIN"
+            << "KEY" << "LEFT" << "LIKE" << "LIMIT" << "MATCH"
+            << "NATURAL" << "NO" << "NOT" << "NOTNULL" << "NULL"
+            << "OF" << "OFFSET" << "ON" << "OR" << "ORDER"
+            << "OUTER" << "PLAN" << "PRAGMA" << "PRIMARY" << "QUERY"
+            << "RAISE" << "REFERENCES" << "REGEXP" << "REINDEX" << "RELEASE"
+            << "RENAME" << "REPLACE" << "RESTRICT" << "RIGHT" << "ROLLBACK"
+            << "ROW" << "SAVEPOINT" << "SELECT" << "SET" << "TABLE"
+            << "TEMP" << "TEMPORARY" << "THEN" << "TO" << "TRANSACTION"
+            << "TRIGGER" << "UNION" << "UNIQUE" << "UPDATE" << "USING"
+            << "VACUUM" << "VALUES" << "VIEW" << "VIRTUAL" << "WHEN"
+            << "WHERE";
 
     foreach (const QString &pattern, keywordPatterns) {
-        rule.pattern = QRegExp(pattern);
+        rule.pattern = QRegExp(QString("\\b%1\\b").arg(pattern));
         rule.pattern.setCaseSensitivity(Qt::CaseInsensitive);
         rule.format = keywordFormat;
         highlightingRules.append(rule);