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

C++ indenter: Add more functions to manage the indenter state.

Browse Source
This commit is contained in:
Christian Kamm
2010-07-06 14:41:34 +02:00
parent 7528b2c63a
commit 74ed3e8a11
3 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/cpptools/cppcodeformatter.cpp
View File

@@ -455,6 +455,8 @@ void CodeFormatter::updateStateUntil(const QTextBlock &endBlock)
{
QStack<State> previousState = initialState();
QTextBlock it = endBlock.document()->firstBlock();
// find the first block that needs recalculation
for (; it.isValid() && it != endBlock; it = it.next()) {
TextBlockUserData *userData = BaseTextDocumentLayout::userData(it);
CppCodeFormatterData *cppData = static_cast<CppCodeFormatterData *>(userData->codeFormatterData());
@@ -469,10 +471,47 @@ void CodeFormatter::updateStateUntil(const QTextBlock &endBlock)
previousState = cppData->m_endState;
}
if (it == endBlock)
return;
// update everthing until endBlock
for (; it.isValid() && it != endBlock; it = it.next()) {
//qDebug() << "recalc line" << it.blockNumber() + 1;
recalculateStateAfter(it);
}
// invalidate everything below by marking the state in endBlock as invalid
TextBlockUserData *userData = BaseTextDocumentLayout::userData(endBlock);
CppCodeFormatterData *cppData = static_cast<CppCodeFormatterData *>(userData->codeFormatterData());
if (cppData)
cppData->setBlockRevision(-1);
}
void CodeFormatter::updateLineStateChange(const QTextBlock &block)
{
if (!block.isValid())
return;
QStack<State> oldEndState;
TextBlockUserData *userData = BaseTextDocumentLayout::userData(block);
CppCodeFormatterData *cppData = static_cast<CppCodeFormatterData *>(userData->codeFormatterData());
if (cppData)
oldEndState = cppData->m_endState;
recalculateStateAfter(block);
if (oldEndState.isEmpty() || oldEndState != cppData->m_endState) {
// invalidate everything below by marking the next block's state as invalid
QTextBlock next = block.next();
if (!next.isValid())
return;
userData = BaseTextDocumentLayout::userData(next);
cppData = static_cast<CppCodeFormatterData *>(userData->codeFormatterData());
if (cppData)
cppData->setBlockRevision(-1);
}
}
CodeFormatter::State CodeFormatter::state(int belowTop) const