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

ClangCodeModel: Support "parentheses" matching for ternary operator

Browse Source 
That is, show which ":" belongs to which "?" when the cursor is on one
of them.

Fixes: QTCREATORBUG-1410
Change-Id: Ie19360b3dfc82d92c264d99a5aa1864eda66e5c8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-02-10 17:49:04 +01:00
parent c058ceead4
commit 5f5f38e028
7 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,12 +161,16 @@ void SemanticHighlighter::onHighlighterResultAvailable(int from, int to)
incrementalApplyExtraAdditionalFormats(highlighter, m_watcher->future(), from, to, m_formatMap,
&splitRawStringLiteral);
// Add information about angle brackets, so they can be highlighted/animated.
// In addition to the paren matching that the syntactic highlighter does
// (parentheses, braces, brackets, comments), here we inject info from the code model
// for angle brackets in templates and the ternary operator.
QPair<QTextBlock, Parentheses> parentheses;
for (int i = from; i < to; ++i) {
const HighlightingResult &result = m_watcher->future().resultAt(i);
if (result.kind != AngleBracketOpen && result.kind != AngleBracketClose)
if (result.kind != AngleBracketOpen && result.kind != AngleBracketClose
&& result.kind != TernaryIf && result.kind != TernaryElse) {
continue;
}
if (parentheses.first.isValid() && result.line - 1 > parentheses.first.blockNumber()) {
TextDocumentLayout::setParentheses(parentheses.first, parentheses.second);
parentheses = {};
@@ -177,8 +181,12 @@ void SemanticHighlighter::onHighlighterResultAvailable(int from, int to)
}
if (result.kind == AngleBracketOpen)
parentheses.second << Parenthesis(Parenthesis::Opened, '<', result.column - 1);
else
else if (result.kind == AngleBracketClose)
parentheses.second << Parenthesis(Parenthesis::Closed, '>', result.column - 1);
else if (result.kind == TernaryIf)
parentheses.second << Parenthesis(Parenthesis::Opened, '?', result.column - 1);
else if (result.kind == TernaryElse)
parentheses.second << Parenthesis(Parenthesis::Closed, ':', result.column - 1);
}
if (parentheses.first.isValid())
TextDocumentLayout::setParentheses(parentheses.first, parentheses.second);

2
src/plugins/cpptools/semantichighlighter.h
View File

@@ -61,6 +61,8 @@ public:
VirtualFunctionDeclarationUse,
AngleBracketOpen,
AngleBracketClose,
TernaryIf,
TernaryElse,
};
using HighlightingRunner = std::function<QFuture<TextEditor::HighlightingResult> ()>;