aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/generichighlighter
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-03-13 16:09:44 +0200
committerOrgad Shaneh <orgads@gmail.com>2016-03-14 08:33:39 +0000
commit3eecd80064bc9b86fcd4e59407c0a4e6b831b5aa (patch)
treed5f784ce886d9283aaeff7b4c62c13dbf5e3c33d /src/plugins/texteditor/generichighlighter
parentee1916fc00c82bd7fe4e997a5c3292455cb26986 (diff)
GenericHighlighter: Annotate styles for formats
And reorder the IDs insertions by the enum order. Change-Id: Idad8e8635772eacbb54b15d78dcd9ab93618fbba Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/generichighlighter')
-rw-r--r--src/plugins/texteditor/generichighlighter/highlighter.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp
index 03bdccd870..bd2e7b7bbb 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp
@@ -87,22 +87,22 @@ Highlighter::Highlighter(QTextDocument *parent) :
{
static QVector<TextStyle> categories;
if (categories.isEmpty()) {
- categories << C_TEXT
- << C_VISUAL_WHITESPACE
- << C_KEYWORD
- << C_TYPE
- << C_COMMENT
- << C_NUMBER
- << C_NUMBER
- << C_NUMBER
- << C_STRING
- << C_STRING
- << C_WARNING
- << C_ERROR
- << C_FUNCTION
- << C_TEXT
- << C_TEXT
- << C_LOCAL;
+ categories << C_TEXT // Normal
+ << C_VISUAL_WHITESPACE // VisualWhitespace
+ << C_KEYWORD // Keyword
+ << C_TYPE // DataType
+ << C_COMMENT // Comment
+ << C_NUMBER // Decimal
+ << C_NUMBER // BaseN
+ << C_NUMBER // Float
+ << C_STRING // Char
+ << C_STRING // String
+ << C_WARNING // Alert
+ << C_ERROR // Error
+ << C_FUNCTION // Function
+ << C_TEXT // RegionMarker
+ << C_TEXT // Others
+ << C_LOCAL; // Identifier
}
setTextFormatCategories(categories);
@@ -123,12 +123,12 @@ KateFormatMap::KateFormatMap()
m_ids.insert(QLatin1String("dsNormal"), Highlighter::Normal);
m_ids.insert(QLatin1String("dsKeyword"), Highlighter::Keyword);
m_ids.insert(QLatin1String("dsDataType"), Highlighter::DataType);
+ m_ids.insert(QLatin1String("dsComment"), Highlighter::Comment);
m_ids.insert(QLatin1String("dsDecVal"), Highlighter::Decimal);
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("dsString"), Highlighter::String);
- m_ids.insert(QLatin1String("dsComment"), Highlighter::Comment);
m_ids.insert(QLatin1String("dsAlert"), Highlighter::Alert);
m_ids.insert(QLatin1String("dsError"), Highlighter::Error);
m_ids.insert(QLatin1String("dsFunction"), Highlighter::Function);