Commit d11af451 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Fixed brace depth level to allow negative numbers

Done with mae.
parent a575cb18
...@@ -108,10 +108,8 @@ void CppHighlighter::highlightBlock(const QString &text) ...@@ -108,10 +108,8 @@ 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(tk.text().at(0)); const QChar c(tk.text().at(0));
parentheses.append(Parenthesis(Parenthesis::Closed, c, tk.position())); parentheses.append(Parenthesis(Parenthesis::Closed, c, tk.position()));
if (tk.is(T_RBRACE)) { if (tk.is(T_RBRACE))
if (--braceDepth < 0) --braceDepth;
braceDepth = 0;
}
} }
bool highlightCurrentWordAsPreprocessor = highlightAsPreprocessor; bool highlightCurrentWordAsPreprocessor = highlightAsPreprocessor;
...@@ -228,7 +226,7 @@ void CppHighlighter::highlightBlock(const QString &text) ...@@ -228,7 +226,7 @@ void CppHighlighter::highlightBlock(const QString &text)
if (currentState != -1) { if (currentState != -1) {
oldState = currentState & 0xff; oldState = currentState & 0xff;
oldBraceDepth = currentState >> 8; oldBraceDepth = currentState >> 8;
block.setUserState(qMax(0, (oldBraceDepth + delta) << 8 ) | oldState); block.setUserState(((oldBraceDepth + delta) << 8 ) | oldState);
} }
block = block.next(); block = block.next();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment