diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-22 17:25:12 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-09-13 11:15:05 +0000 |
| commit | 50e5aacb026e79995c9967b12eabb9d37336a841 (patch) | |
| tree | 13fec0e3b67bd9197c887ad0a9a61ec520bfc50f /src/plugins/clangcodemodel | |
| parent | ccf2d848f4514428bbfe1702e43b20dcb77f58e8 (diff) | |
| download | qt-creator-50e5aacb026e79995c9967b12eabb9d37336a841.tar.gz | |
Highlighting: Add highlighting style for punctuation
Currently only operators have their own style but not
punctuation tokens. Make possible to highlight both.
Task-number: QTCREATORBUG-20666
Change-Id: I9533e0f1bef65b86c4e4f5c9756571103584124b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel')
| -rw-r--r-- | src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/clangcodemodel/clangutils.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp b/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp index 795941f6ec..125d4405a7 100644 --- a/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp +++ b/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp @@ -62,6 +62,8 @@ TextEditor::TextStyle toTextStyle(ClangBackEnd::HighlightingType type) case HighlightingType::PreprocessorDefinition: case HighlightingType::PreprocessorExpansion: return TextEditor::C_PREPROCESSOR; + case HighlightingType::Punctuation: + return TextEditor::C_PUNCTUATION; case HighlightingType::Declaration: return TextEditor::C_DECLARATION; case HighlightingType::FunctionDefinition: diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index 725042488b..9638cfa2dd 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -235,7 +235,8 @@ int clangColumn(const QTextBlock &line, int cppEditorColumn) ClangBackEnd::StorageClass storageClass = extraInfo.storageClass; if (mainType == ClangBackEnd::HighlightingType::VirtualFunction || mainType == ClangBackEnd::HighlightingType::Function - || mainType == ClangBackEnd::HighlightingType::Operator) { + || token.types.mixinHighlightingTypes.contains( + ClangBackEnd::HighlightingType::Operator)) { if (storageClass != ClangBackEnd::StorageClass::Static) { switch (access) { case ClangBackEnd::AccessSpecifier::Public: |