feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericHighlighter: Support new default styles

Browse Source 
Introduced in KTextEditor commit f80e12bedca0d8f682aebc450d1b6d66550010ce
(version 4.100, 2014 Mar).

Change-Id: Ib3614077b3bf5f4254266ec79d0abdbb486fd685
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-03-13 15:45:00 +02:00
committed by Orgad Shaneh
parent 3eecd80064
commit 5da9055706
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/texteditor/generichighlighter/highlighter.cpp
View File

@@ -96,11 +96,22 @@ Highlighter::Highlighter(QTextDocument *parent) :
<< C_NUMBER // BaseN << C_NUMBER // BaseN
<< C_NUMBER // Float << C_NUMBER // Float
<< C_STRING // Char << C_STRING // Char
<< C_STRING // SpecialChar
<< C_STRING // String << C_STRING // String
<< C_WARNING // Alert << C_WARNING // Alert
<< C_TEXT // Information
<< C_WARNING // Warning
<< C_ERROR // Error << C_ERROR // Error
<< C_FUNCTION // Function << C_FUNCTION // Function
<< C_TEXT // RegionMarker << 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_TEXT // Others
<< C_LOCAL; // Identifier << C_LOCAL; // Identifier
} }
@@ -128,11 +139,22 @@ KateFormatMap::KateFormatMap()
m_ids.insert(QLatin1String("dsBaseN"), Highlighter::BaseN); m_ids.insert(QLatin1String("dsBaseN"), Highlighter::BaseN);
m_ids.insert(QLatin1String("dsFloat"), Highlighter::Float); m_ids.insert(QLatin1String("dsFloat"), Highlighter::Float);
m_ids.insert(QLatin1String("dsChar"), Highlighter::Char); 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("dsString"), Highlighter::String);
m_ids.insert(QLatin1String("dsAlert"), Highlighter::Alert); 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("dsError"), Highlighter::Error);
m_ids.insert(QLatin1String("dsFunction"), Highlighter::Function); m_ids.insert(QLatin1String("dsFunction"), Highlighter::Function);
m_ids.insert(QLatin1String("dsRegionMarker"), Highlighter::RegionMarker); 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("dsOthers"), Highlighter::Others);
m_ids.insert(QLatin1String("dsIdentifier"), Highlighter::Identifier); m_ids.insert(QLatin1String("dsIdentifier"), Highlighter::Identifier);
} }

11
src/plugins/texteditor/generichighlighter/highlighter.h
View File

@@ -74,11 +74,22 @@ public:
BaseN, BaseN,
Float, Float,
Char, Char,
SpecialChar,
String, String,
Alert, Alert,
Information,
Warning,
Error, Error,
Function, Function,
RegionMarker, RegionMarker,
BuiltIn,
Extension,
Operator,
Variable,
Attribute,
Annotation,
CommentVar,
Import,
Others, Others,
Identifier Identifier
}; };