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

Make functionality of applying mixin text styles available for everyone

Browse Source 
Change-Id: I0e702be0572229ec96c71d0ae2b5395a3c2fb29e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2017-05-24 10:09:30 +02:00
parent 6174cca5a0
commit 68a89c29a4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cpptools/semantichighlighter.cpp
View File

@@ -134,15 +134,6 @@ unsigned SemanticHighlighter::documentRevision() const
return m_baseTextDocument->document()->revision(); return m_baseTextDocument->document()->revision();
} }
static TextStyles mixinStyle(TextStyle main, TextStyle mixin)
{
TextStyles res;
res.mainStyle = main;
res.mixinStyles.initializeElements();
res.mixinStyles.push_back(mixin);
return res;
}
void SemanticHighlighter::updateFormatMapFromFontSettings() void SemanticHighlighter::updateFormatMapFromFontSettings()
{ {
QTC_ASSERT(m_baseTextDocument, return); QTC_ASSERT(m_baseTextDocument, return);
@@ -158,9 +149,9 @@ void SemanticHighlighter::updateFormatMapFromFontSettings()
m_formatMap[MacroUse] = fs.toTextCharFormat(C_PREPROCESSOR); m_formatMap[MacroUse] = fs.toTextCharFormat(C_PREPROCESSOR);
m_formatMap[FunctionUse] = fs.toTextCharFormat(C_FUNCTION); m_formatMap[FunctionUse] = fs.toTextCharFormat(C_FUNCTION);
m_formatMap[FunctionDeclarationUse] = m_formatMap[FunctionDeclarationUse] =
fs.toTextCharFormat(mixinStyle(C_FUNCTION, C_DECLARATION)); fs.toTextCharFormat(TextStyles::mixinStyle(C_FUNCTION, C_DECLARATION));
m_formatMap[VirtualFunctionDeclarationUse] = m_formatMap[VirtualFunctionDeclarationUse] =
fs.toTextCharFormat(mixinStyle(C_VIRTUAL_METHOD, C_DECLARATION)); fs.toTextCharFormat(TextStyles::mixinStyle(C_VIRTUAL_METHOD, C_DECLARATION));
m_formatMap[PseudoKeywordUse] = fs.toTextCharFormat(C_KEYWORD); m_formatMap[PseudoKeywordUse] = fs.toTextCharFormat(C_KEYWORD);
m_formatMap[StringUse] = fs.toTextCharFormat(C_STRING); m_formatMap[StringUse] = fs.toTextCharFormat(C_STRING);
} }

9
src/plugins/texteditor/textstyles.h
View File

@@ -35,6 +35,15 @@ using MixinTextStyles = Utils::SizedArray<TextStyle, 6>;
struct TextStyles { struct TextStyles {
TextStyle mainStyle; TextStyle mainStyle;
MixinTextStyles mixinStyles; MixinTextStyles mixinStyles;
static TextStyles mixinStyle(TextStyle main, TextStyle mixin)
{
TextStyles res;
res.mainStyle = main;
res.mixinStyles.initializeElements();
res.mixinStyles.push_back(mixin);
return res;
}
}; };
} // namespace TextEditor } // namespace TextEditor