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

fix auto braces with preprocessor directives

Browse Source 
We now exclude brace in ifdefed out sections when calculating,
whether or not the braces match. This requires adjust the brace
levels whenever sections get ifdef'd out or ifdef'd in again.
This commit is contained in:
mae
2009-09-25 17:22:10 +02:00
parent d5af926c21
commit 36fb96b69d
3 changed files with 77 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,12 +52,13 @@ void CppHighlighter::highlightBlock(const QString &text)
QTextCharFormat emptyFormat;
const int previousState = previousBlockState();
int state = 0, braceDepth = 0;
int state = 0, initialBraceDepth = 0;
if (previousState != -1) {
state = previousState & 0xff;
braceDepth = previousState >> 8;
initialBraceDepth = previousState >> 8;
}
int braceDepth = initialBraceDepth;
SimpleLexer tokenize;
tokenize.setQtMocRunEnabled(false);
@@ -211,6 +212,10 @@ void CppHighlighter::highlightBlock(const QString &text)
TextEditDocumentLayout::setParentheses(currentBlock(), parentheses);
// if the block is ifdefed out, we only store the parentheses, but
// do not adjust the brace depth.
if (TextEditDocumentLayout::ifdefedOut(currentBlock()))
braceDepth = initialBraceDepth;
// optimization: if only the brace depth changes, we adjust subsequent blocks
// to have QSyntaxHighlighter stop the rehighlighting
@@ -222,12 +227,7 @@ void CppHighlighter::highlightBlock(const QString &text)
int delta = braceDepth - oldBraceDepth;
QTextBlock block = currentBlock().next();
while (block.isValid()) {
currentState = block.userState();
if (currentState != -1) {
oldState = currentState & 0xff;
oldBraceDepth = currentState >> 8;
block.setUserState(((oldBraceDepth + delta) << 8 ) | oldState);
}
TextEditDocumentLayout::changeBraceDepth(block, delta);
block = block.next();
}
}