Merge pull request #331 from cesar-douady/function_highlight

epasveer · web-flow · commit d73eea5f49a0 · 2025-06-25T16:47:16.000-05:00
improve hightlighting : give keywords high precedence than functions
diff --git a/src/SeerCppSourceHighlighter.cpp b/src/SeerCppSourceHighlighter.cpp
@@ -75,14 +75,6 @@ void SeerCppSourceHighlighter::setHighlighterSettings (const SeerHighlighterSett
 
     HighlightingRule rule;
 
-    for (const QString& pattern : keywordPatterns) {
-
-        rule.pattern = QRegularExpression(pattern);
-        rule.format  = _keywordFormat;
-
-        _highlightingRules.append(rule);
-    }
-
     // Set class format and expression.
     rule.pattern = QRegularExpression(QStringLiteral("\\bQ[A-Za-z]+\\b"));
     rule.format = _classFormat;
@@ -98,6 +90,15 @@ void SeerCppSourceHighlighter::setHighlighterSettings (const SeerHighlighterSett
     rule.format = _functionFormat;
     _highlightingRules.append(rule);
 
+	// Set keywords format and expression (must have precedence over functions)
+    for (const QString& pattern : keywordPatterns) {
+
+        rule.pattern = QRegularExpression(pattern);
+        rule.format  = _keywordFormat;
+
+        _highlightingRules.append(rule);
+    }
+
     // Set single line comment format and expression.
     rule.pattern = QRegularExpression(QStringLiteral("//[^\n]*"));
     rule.format  = _singleLineCommentFormat;
