highlighter: add support for hash declarations

crackedmind · Mar 3, 2021 · b28ca37 · b28ca37
1 parent 6b61d07
commit b28ca37
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/vcreatorhighlighter.cpp b/vcreatorhighlighter.cpp
@@ -52,6 +52,14 @@ void VlangHighlighter::highlightBlock(const QString &text)
                 setFormat(token.offset, token.length, formatForCategory(TextEditor::C_NUMBER));
                 break;
 
+            case Token::Hash: {
+                static QSet<QString> hashDecls = {"#include", "#flag", "#pkgconfig", "#define"};
+                if (hashDecls.contains(text.mid(token.offset, token.length)))
+                    setFormat(token.offset, token.length, formatForCategory(TextEditor::C_PREPROCESSOR));
+                else
+                    setFormat(token.offset, token.length, formatForCategory(TextEditor::C_TEXT));
+            } break;
+
             case Token::Comment:
                 if (m_inMultilineComment
                     && Utils::midView(text, token.end() - 2, 2) == QLatin1String("*/")) {

diff --git a/vcreatorlexer.cpp b/vcreatorlexer.cpp
@@ -295,6 +295,13 @@ QList<Token> Scanner::operator()(const QString &text, int startState)
          case ',':
             tokens.append(Token(index++, 1, Token::Comma));
             break;
+         case '#': {
+             const int start = index;
+             do {
+                 ++index;
+             } while (index < text.length() && isIdentifierChar(text.at(index)));
+             tokens.append(Token(start, index - start, Token::Hash));
+         } break;
 
         default:
             if (ch.isSpace()) {

diff --git a/vcreatorlexer.h b/vcreatorlexer.h
@@ -16,6 +16,7 @@ class Token
         String,
         Comment,
         Number,
+        Hash,
         Operator,
         BuiltinType,
         BuiltinFn,