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

CppEditor: Fix wrong temporary parentheses mismatch indicator

Browse Source 
Do not clear out "semantic parentheses" in the syntactic highlighter.

Fixes: QTCREATORBUG-26183
Change-Id: I88f085b63da2469341dbb29eabc7f033367e6f19
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-09-24 11:59:24 +02:00
parent 553f4bec7e
commit 0524e9236f
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -91,7 +91,14 @@ void CppHighlighter::highlightBlock(const QString &text)
const int firstNonSpace = tokens.first().utf16charsBegin(); const int firstNonSpace = tokens.first().utf16charsBegin();
Parentheses parentheses; // Keep "semantic parentheses".
Parentheses parentheses = Utils::filtered(TextDocumentLayout::parentheses(currentBlock()),
[](const Parenthesis &p) { return p.source.isValid(); });
const auto insertParen = [&parentheses](const Parenthesis &p) {
const auto it = std::lower_bound(parentheses.begin(), parentheses.end(), p,
[](const auto &p1, const auto &p2) { return p1.pos < p2.pos; });
parentheses.insert(it, p);
};
parentheses.reserve(5); parentheses.reserve(5);
bool expectPreprocessorKeyword = false; bool expectPreprocessorKeyword = false;
@@ -116,7 +123,7 @@ void CppHighlighter::highlightBlock(const QString &text)
if (tk.is(T_LPAREN) || tk.is(T_LBRACE) || tk.is(T_LBRACKET)) { if (tk.is(T_LPAREN) || tk.is(T_LBRACE) || tk.is(T_LBRACKET)) {
const QChar c = text.at(tk.utf16charsBegin()); const QChar c = text.at(tk.utf16charsBegin());
parentheses.append(Parenthesis(Parenthesis::Opened, c, tk.utf16charsBegin())); insertParen({Parenthesis::Opened, c, tk.utf16charsBegin()});
if (tk.is(T_LBRACE)) { if (tk.is(T_LBRACE)) {
++braceDepth; ++braceDepth;
@@ -129,7 +136,7 @@ void CppHighlighter::highlightBlock(const QString &text)
} }
} else if (tk.is(T_RPAREN) || tk.is(T_RBRACE) || tk.is(T_RBRACKET)) { } else if (tk.is(T_RPAREN) || tk.is(T_RBRACE) || tk.is(T_RBRACKET)) {
const QChar c = text.at(tk.utf16charsBegin()); const QChar c = text.at(tk.utf16charsBegin());
parentheses.append(Parenthesis(Parenthesis::Closed, c, tk.utf16charsBegin())); insertParen({Parenthesis::Closed, c, tk.utf16charsBegin()});
if (tk.is(T_RBRACE)) { if (tk.is(T_RBRACE)) {
--braceDepth; --braceDepth;
if (braceDepth < foldingIndent) { if (braceDepth < foldingIndent) {
@@ -210,7 +217,7 @@ void CppHighlighter::highlightBlock(const QString &text)
else else
foldingIndent = qMin(braceDepth, foldingIndent); foldingIndent = qMin(braceDepth, foldingIndent);
const int tokenEnd = tk.utf16charsBegin() + tk.utf16chars() - 1; const int tokenEnd = tk.utf16charsBegin() + tk.utf16chars() - 1;
parentheses.append(Parenthesis(Parenthesis::Closed, QLatin1Char('-'), tokenEnd)); insertParen({Parenthesis::Closed, QLatin1Char('-'), tokenEnd});
// clear the initial state. // clear the initial state.
initialLexerState = 0; initialLexerState = 0;
@@ -246,8 +253,7 @@ void CppHighlighter::highlightBlock(const QString &text)
if (!initialLexerState && lexerState && !tokens.isEmpty()) { if (!initialLexerState && lexerState && !tokens.isEmpty()) {
const Token &lastToken = tokens.last(); const Token &lastToken = tokens.last();
if (lastToken.is(T_COMMENT) || lastToken.is(T_DOXY_COMMENT)) { if (lastToken.is(T_COMMENT) || lastToken.is(T_DOXY_COMMENT)) {
parentheses.append(Parenthesis(Parenthesis::Opened, QLatin1Char('+'), insertParen({Parenthesis::Opened, QLatin1Char('+'), lastToken.utf16charsBegin()});
lastToken.utf16charsBegin()));
++braceDepth; ++braceDepth;
} }
} }