Commit 1f9be179 authored by Christian Kamm's avatar Christian Kamm
Browse files

C++ indenter: Make continuations after ( consistent.

Change-Id: Iae780127065e3fce274db10e173f5c0bde15bd92
Reviewed-on: http://codereview.qt.nokia.com/1229

Reviewed-by: default avatarLeandro T. C. Melo <leandro.melo@nokia.com>
parent 8d8d9d46
......@@ -1144,6 +1144,7 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
case arglist_open:
case condition_paren_open:
case member_init_paren_open:
if (!lastToken)
*paddingDepth = nextTokenPosition-*indentDepth;
else
......@@ -1179,10 +1180,6 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
*paddingDepth += 2; // savedIndentDepth is the position of ':'
break;
case member_init_paren_open:
addContinuationIndent(paddingDepth);
break;
case case_cont:
if (m_styleSettings.indentStatementsRelativeToSwitchLabels)
*indentDepth += m_tabSettings.m_indentSize;
......
......@@ -115,7 +115,8 @@ private Q_SLOTS:
void functionBodyAndBraces2();
void functionBodyAndBraces3();
void functionBodyAndBraces4();
void constructor();
void constructor1();
void constructor2();
void caseBody1();
void caseBody2();
void caseBody3();
......@@ -1080,7 +1081,7 @@ void tst_CodeFormatter::memberInitializer()
<< Line(" Foo()")
<< Line(" ~ : baR(),")
<< Line(" ~ moodoo(barR + ")
<< Line(" ~ 42),")
<< Line(" ~ 42),")
<< Line(" ~ xyz()")
<< Line(" {}")
<< Line("};")
......@@ -1764,7 +1765,7 @@ void tst_CodeFormatter::functionBodyAndBraces4()
checkIndent(data, codeStyle);
}
void tst_CodeFormatter::constructor()
void tst_CodeFormatter::constructor1()
{
QList<Line> data;
data << Line("class Foo {")
......@@ -1782,6 +1783,42 @@ void tst_CodeFormatter::constructor()
checkIndent(data, codeStyle);
}
void tst_CodeFormatter::constructor2()
{
QList<Line> data;
data << Line("class Foo {")
<< Line(" Foo() : _a(0)")
<< Line(" {")
<< Line(" _b = 0")
<< Line(" }")
<< Line(" int _a;")
<< Line(" Foo()")
<< Line(" ~ : _foo(1),")
<< Line(" ~ _bar(2),")
<< Line(" ~ _carooooo(")
<< Line(" ~ foo() + 12),")
<< Line(" ~ _carooooo(foo(),")
<< Line(" ~ 12)")
<< Line(" {")
<< Line(" _b = 0")
<< Line(" }")
<< Line(" int _b;")
<< Line(" Foo()")
<< Line(" ~ : _foo(1)")
<< Line(" ~ , _bar(2)")
<< Line(" ~ , _carooooo(")
<< Line(" ~ foo() + 12)")
<< Line(" ~ , _carooooo(foo(),")
<< Line(" ~ 12)")
<< Line(" {")
<< Line(" _b = 0")
<< Line(" }")
<< Line("};")
;
CppCodeStyleSettings codeStyle;
checkIndent(data);
}
void tst_CodeFormatter::caseBody1()
{
QList<Line> data;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment