diff --git a/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp b/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp index 1d96fc7b2d7..ea378e45f17 100644 --- a/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp +++ b/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp @@ -25,6 +25,7 @@ #include "clanghighlightingresultreporter.h" +#include #include #include @@ -143,9 +144,9 @@ TextEditor::HighlightingResult toHighlightingResult( TextEditor::HighlightingResult result(tokenInfo.line, tokenInfo.column, tokenInfo.length, textStyles); if (tokenInfo.types.mixinHighlightingTypes.contains(HighlightingType::AngleBracketOpen)) - result.kind = 1; + result.kind = CppTools::SemanticHighlighter::AngleBracketOpen; else if (tokenInfo.types.mixinHighlightingTypes.contains(HighlightingType::AngleBracketClose)) - result.kind = 2; + result.kind = CppTools::SemanticHighlighter::AngleBracketClose; return result; } diff --git a/src/plugins/cpptools/semantichighlighter.cpp b/src/plugins/cpptools/semantichighlighter.cpp index 431bf1849cc..347a1d6e755 100644 --- a/src/plugins/cpptools/semantichighlighter.cpp +++ b/src/plugins/cpptools/semantichighlighter.cpp @@ -165,7 +165,7 @@ void SemanticHighlighter::onHighlighterResultAvailable(int from, int to) QPair parentheses; for (int i = from; i < to; ++i) { const HighlightingResult &result = m_watcher->future().resultAt(i); - if (result.kind == 0) + if (result.kind != AngleBracketOpen && result.kind != AngleBracketClose) continue; if (parentheses.first.isValid() && result.line - 1 > parentheses.first.blockNumber()) { TextDocumentLayout::setParentheses(parentheses.first, parentheses.second); @@ -175,7 +175,7 @@ void SemanticHighlighter::onHighlighterResultAvailable(int from, int to) parentheses.first = m_baseTextDocument->document()->findBlockByNumber(result.line - 1); parentheses.second = TextDocumentLayout::parentheses(parentheses.first); } - if (result.kind == 1) + if (result.kind == AngleBracketOpen) parentheses.second << Parenthesis(Parenthesis::Opened, '<', result.column - 1); else parentheses.second << Parenthesis(Parenthesis::Closed, '>', result.column - 1); diff --git a/src/plugins/cpptools/semantichighlighter.h b/src/plugins/cpptools/semantichighlighter.h index 5b42982cb64..99f55d46c9a 100644 --- a/src/plugins/cpptools/semantichighlighter.h +++ b/src/plugins/cpptools/semantichighlighter.h @@ -59,6 +59,8 @@ public: StringUse, FunctionDeclarationUse, VirtualFunctionDeclarationUse, + AngleBracketOpen, + AngleBracketClose, }; using HighlightingRunner = std::function ()>;