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

C++ indenter: Fix function declaration continuation indent.

Browse Source 
Change-Id: I0ebe1f0f531cb4830f80b80c6bb52caeaee01353
Reviewed-on: http://codereview.qt.nokia.com/1167
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-07-05 15:29:19 +02:00
parent 2fba201783
commit e2cdaf7888
3 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1058,6 +1058,14 @@ int QtStyleCodeFormatter::loadLexerState(const QTextBlock &block) const
return BaseTextDocumentLayout::lexerState(block); 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 void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedIndentDepth, int *paddingDepth, int *savedPaddingDepth) const
{ {
const State &parentState = state(); const State &parentState = state();
@@ -1094,12 +1102,8 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
case template_param: case template_param:
if (!lastToken) if (!lastToken)
*paddingDepth = nextTokenPosition-*indentDepth; *paddingDepth = nextTokenPosition-*indentDepth;
else { else
if (*paddingDepth == 0) addContinuationIndent(paddingDepth);
*paddingDepth = 2*m_tabSettings.m_indentSize;
else
*paddingDepth += m_tabSettings.m_indentSize;
}
break; break;
case statement_with_condition: case statement_with_condition:
@@ -1143,14 +1147,14 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
if (!lastToken) if (!lastToken)
*paddingDepth = nextTokenPosition-*indentDepth; *paddingDepth = nextTokenPosition-*indentDepth;
else else
*paddingDepth += m_tabSettings.m_indentSize; addContinuationIndent(paddingDepth);
break; break;
case ternary_op: case ternary_op:
if (!lastToken) if (!lastToken)
*paddingDepth = spaceOrNextTokenPosition-*indentDepth; *paddingDepth = spaceOrNextTokenPosition-*indentDepth;
else else
*paddingDepth += m_tabSettings.m_indentSize; addContinuationIndent(paddingDepth);
break; break;
case stream_op: case stream_op:
@@ -1176,7 +1180,7 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
break; break;
case member_init_paren_open: case member_init_paren_open:
*paddingDepth += m_tabSettings.m_indentSize; addContinuationIndent(paddingDepth);
break; break;
case case_cont: case case_cont:

2
src/plugins/cpptools/cppcodeformatter.h
View File

@@ -278,6 +278,8 @@ protected:
static bool shouldClearPaddingOnEnter(int state); static bool shouldClearPaddingOnEnter(int state);
private: private:
void addContinuationIndent(int *paddingDepth) const;
TextEditor::TabSettings m_tabSettings; TextEditor::TabSettings m_tabSettings;
CppCodeStyleSettings m_styleSettings; CppCodeStyleSettings m_styleSettings;
}; };

40
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
View File

@@ -61,9 +61,11 @@ private Q_SLOTS:
void preprocessorContinuation(); void preprocessorContinuation();
void cStyleComments(); void cStyleComments();
void cppStyleComments(); void cppStyleComments();
void expressionContinuation(); void expressionContinuation1();
void expressionContinuation2();
void assignContinuation1(); void assignContinuation1();
void assignContinuation2(); void assignContinuation2();
void declarationContinuation();
void classAccess(); void classAccess();
void ternary(); void ternary();
void objcAtDeclarations(); void objcAtDeclarations();
@@ -601,7 +603,7 @@ void tst_CodeFormatter::cppStyleComments()
checkIndent(data); checkIndent(data);
} }
void tst_CodeFormatter::expressionContinuation() void tst_CodeFormatter::expressionContinuation1()
{ {
QList<Line> data; QList<Line> data;
data << Line("void foo() {") data << Line("void foo() {")
@@ -628,9 +630,27 @@ void tst_CodeFormatter::expressionContinuation()
<< Line(" ~ foo - blah(1)") << Line(" ~ foo - blah(1)")
<< Line(" ~ << '?'") << Line(" ~ << '?'")
<< Line(" ~ << \"\\n\";") << Line(" ~ << \"\\n\";")
<< Line(" i += foo(") << Line("}")
;
checkIndent(data);
}
void tst_CodeFormatter::expressionContinuation2()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" i += abc +")
<< Line(" ~ foo(,")
<< Line(" ~ bar,") << Line(" ~ bar,")
<< Line(" ~ 2);") << Line(" ~ 2")
<< Line(" ~ );")
<< Line(" i += abc +")
<< Line(" ~ foo(,")
<< Line(" ~ bar(")
<< Line(" ~ bar,")
<< Line(" ~ 2")
<< Line(" ~ ),")
<< Line(" ~ abc);")
<< Line("}") << Line("}")
; ;
checkIndent(data); checkIndent(data);
@@ -676,6 +696,18 @@ void tst_CodeFormatter::assignContinuation2()
checkIndent(data, style); checkIndent(data, style);
} }
void tst_CodeFormatter::declarationContinuation()
{
QList<Line> data;
data << Line("void foo(")
<< Line("~ int a,")
<< Line("~ int b);")
<< Line("void foo(int a,")
<< Line("~ int b);")
;
checkIndent(data);
}
void tst_CodeFormatter::classAccess() void tst_CodeFormatter::classAccess()
{ {
QList<Line> data; QList<Line> data;