From 5da9055706eac6777d461d2608142d200fc12f6c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 13 Mar 2016 15:45:00 +0200
Subject: [PATCH] GenericHighlighter: Support new default styles
Introduced in KTextEditor commit f80e12bedca0d8f682aebc450d1b6d66550010ce
(version 4.100, 2014 Mar).
Change-Id: Ib3614077b3bf5f4254266ec79d0abdbb486fd685
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
---
.../generichighlighter/highlighter.cpp | 22 +++++++++++++++++++
.../generichighlighter/highlighter.h | 11 ++++++++++
2 files changed, 33 insertions(+)
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp
index bd2e7b7bbb3..dba162ace25 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp
@@ -96,11 +96,22 @@ Highlighter::Highlighter(QTextDocument *parent) :
<< C_NUMBER // BaseN
<< C_NUMBER // Float
<< C_STRING // Char
+ << C_STRING // SpecialChar
<< C_STRING // String
<< C_WARNING // Alert
+ << C_TEXT // Information
+ << C_WARNING // Warning
<< C_ERROR // Error
<< C_FUNCTION // Function
<< C_TEXT // RegionMarker
+ << C_PREPROCESSOR // BuiltIn
+ << C_PRIMITIVE_TYPE // Extension
+ << C_OPERATOR // Operator
+ << C_LOCAL // Variable
+ << C_LABEL // Attribute
+ << C_TEXT // Annotation
+ << C_COMMENT // CommentVar
+ << C_PREPROCESSOR // Import
<< C_TEXT // Others
<< C_LOCAL; // Identifier
}
@@ -128,11 +139,22 @@ KateFormatMap::KateFormatMap()
m_ids.insert(QLatin1String("dsBaseN"), Highlighter::BaseN);
m_ids.insert(QLatin1String("dsFloat"), Highlighter::Float);
m_ids.insert(QLatin1String("dsChar"), Highlighter::Char);
+ m_ids.insert(QLatin1String("dsSpecialChar"), Highlighter::SpecialChar);
m_ids.insert(QLatin1String("dsString"), Highlighter::String);
m_ids.insert(QLatin1String("dsAlert"), Highlighter::Alert);
+ m_ids.insert(QLatin1String("dsInformation"), Highlighter::Information);
+ m_ids.insert(QLatin1String("dsWarning"), Highlighter::Warning);
m_ids.insert(QLatin1String("dsError"), Highlighter::Error);
m_ids.insert(QLatin1String("dsFunction"), Highlighter::Function);
m_ids.insert(QLatin1String("dsRegionMarker"), Highlighter::RegionMarker);
+ m_ids.insert(QLatin1String("dsBuiltIn"), Highlighter::BuiltIn);
+ m_ids.insert(QLatin1String("dsExtension"), Highlighter::Extension);
+ m_ids.insert(QLatin1String("dsOperator"), Highlighter::Operator);
+ m_ids.insert(QLatin1String("dsVariable"), Highlighter::Variable);
+ m_ids.insert(QLatin1String("dsAttribute"), Highlighter::Attribute);
+ m_ids.insert(QLatin1String("dsAnnotation"), Highlighter::Annotation);
+ m_ids.insert(QLatin1String("dsCommentVar"), Highlighter::CommentVar);
+ m_ids.insert(QLatin1String("dsImport"), Highlighter::Import);
m_ids.insert(QLatin1String("dsOthers"), Highlighter::Others);
m_ids.insert(QLatin1String("dsIdentifier"), Highlighter::Identifier);
}
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h
index b3bae3bbef2..c3eab63439e 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.h
+++ b/src/plugins/texteditor/generichighlighter/highlighter.h
@@ -74,11 +74,22 @@ public:
BaseN,
Float,
Char,
+ SpecialChar,
String,
Alert,
+ Information,
+ Warning,
Error,
Function,
RegionMarker,
+ BuiltIn,
+ Extension,
+ Operator,
+ Variable,
+ Attribute,
+ Annotation,
+ CommentVar,
+ Import,
Others,
Identifier
};
--
GitLab