diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-07-05 15:29:19 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-07-06 10:00:05 +0200 |
| commit | e2cdaf7888bd533ffaa074e4721f37c6202557f6 (patch) | |
| tree | 8e260cc09f3995753f3856d2c7ad5f8e67fba3ff /src/plugins/cpptools/cppcodeformatter.cpp | |
| parent | 2fba2017830703f620d4e427a8c201fe71570235 (diff) | |
| download | qt-creator-e2cdaf7888bd533ffaa074e4721f37c6202557f6.tar.gz | |
C++ indenter: Fix function declaration continuation indent.
Change-Id: I0ebe1f0f531cb4830f80b80c6bb52caeaee01353
Reviewed-on: http://codereview.qt.nokia.com/1167
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 4a355f6ffb..7bb38600ac 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -1058,6 +1058,14 @@ int QtStyleCodeFormatter::loadLexerState(const QTextBlock &block) const return BaseTextDocumentLayout::lexerState(block); } +void QtStyleCodeFormatter::addContinuationIndent(int *paddingDepth) const +{ + if (*paddingDepth == 0) + *paddingDepth = 2*m_tabSettings.m_indentSize; + else + *paddingDepth += m_tabSettings.m_indentSize; +} + void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedIndentDepth, int *paddingDepth, int *savedPaddingDepth) const { const State &parentState = state(); @@ -1094,12 +1102,8 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd case template_param: if (!lastToken) *paddingDepth = nextTokenPosition-*indentDepth; - else { - if (*paddingDepth == 0) - *paddingDepth = 2*m_tabSettings.m_indentSize; - else - *paddingDepth += m_tabSettings.m_indentSize; - } + else + addContinuationIndent(paddingDepth); break; case statement_with_condition: @@ -1143,14 +1147,14 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd if (!lastToken) *paddingDepth = nextTokenPosition-*indentDepth; else - *paddingDepth += m_tabSettings.m_indentSize; + addContinuationIndent(paddingDepth); break; case ternary_op: if (!lastToken) *paddingDepth = spaceOrNextTokenPosition-*indentDepth; else - *paddingDepth += m_tabSettings.m_indentSize; + addContinuationIndent(paddingDepth); break; case stream_op: @@ -1176,7 +1180,7 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd break; case member_init_paren_open: - *paddingDepth += m_tabSettings.m_indentSize; + addContinuationIndent(paddingDepth); break; case case_cont: |