From e2cdaf7888bd533ffaa074e4721f37c6202557f6 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 5 Jul 2011 15:29:19 +0200 Subject: C++ indenter: Fix function declaration continuation indent. Change-Id: I0ebe1f0f531cb4830f80b80c6bb52caeaee01353 Reviewed-on: http://codereview.qt.nokia.com/1167 Reviewed-by: Leandro T. C. Melo --- src/plugins/cpptools/cppcodeformatter.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/plugins/cpptools/cppcodeformatter.cpp') 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: -- cgit v1.2.1