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

C++ indenter: Add support for other brace styles.

Browse Source
This commit is contained in:
Christian Kamm
2010-07-05 09:59:42 +02:00
parent 76ebb46479
commit 3100fc0b7e
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -794,6 +794,7 @@ void CodeFormatter::dump()
QtStyleCodeFormatter::QtStyleCodeFormatter()
: m_indentSize(4)
, m_style(QtStyle)
{
}
@@ -805,6 +806,14 @@ void QtStyleCodeFormatter::setIndentSize(int size)
}
}
void QtStyleCodeFormatter::setCompoundStyle(CompoundStyle style)
{
if (style != m_style) {
m_style = style;
invalidateCache();
}
}
void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedIndentDepth) const
{
const State &parentState = state();
@@ -878,6 +887,8 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
break;
case substatement_open:
if (m_style == WhitesmithsStyle)
break;
if (parentState.type != switch_statement)
*indentDepth += m_indentSize;
break;
@@ -908,6 +919,9 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
// undo the continuation indent of the parent
*indentDepth = parentState.savedIndentDepth;
*savedIndentDepth = *indentDepth;
// these styles want to indent braces
if (m_style == GnuStyle || m_style == WhitesmithsStyle)
*savedIndentDepth += m_indentSize;
break;
case maybe_else: {