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

C++ indenter: Don't get confused on 'for (a in b)'.

Browse Source 
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-10-06 13:50:04 +02:00
parent a36dc1d41e
commit c2d890f65e
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,12 +317,14 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
switch (kind) { switch (kind) {
case T_SEMICOLON: turnInto(for_statement_condition); break; case T_SEMICOLON: turnInto(for_statement_condition); break;
case T_LPAREN: enter(condition_paren_open); break; case T_LPAREN: enter(condition_paren_open); break;
case T_RPAREN: turnInto(for_statement_expression); continue;
} break; } break;
case for_statement_condition: case for_statement_condition:
switch (kind) { switch (kind) {
case T_SEMICOLON: turnInto(for_statement_expression); break; case T_SEMICOLON: turnInto(for_statement_expression); break;
case T_LPAREN: enter(condition_paren_open); break; case T_LPAREN: enter(condition_paren_open); break;
case T_RPAREN: turnInto(for_statement_expression); continue;
} break; } break;
case for_statement_expression: case for_statement_expression:

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

@@ -33,6 +33,7 @@ private Q_SLOTS:
void classAccess(); void classAccess();
void ternary(); void ternary();
void objcAtDeclarations(); void objcAtDeclarations();
void objcCallAndFor();
void braceList(); void braceList();
void bug1(); void bug1();
void bug2(); void bug2();
@@ -666,6 +667,24 @@ void tst_CodeFormatter::objcAtDeclarations()
checkIndent(data); checkIndent(data);
} }
void tst_CodeFormatter::objcCallAndFor()
{
QList<Line> data;
data << Line("void foo() {")
<< Line(" NSArray *windows = [NSApp windows];")
<< Line(" for (NSWindow *window in windows) {")
<< Line(" NSArray *drawers = [window drawers];")
<< Line(" for (NSDrawer *drawer in drawers) {")
<< Line(" NSArray *views = [[drawer contentView] subviews];")
<< Line(" int x;")
<< Line(" }")
<< Line(" }")
<< Line("}")
<< Line("int y;")
;
checkIndent(data);
}
void tst_CodeFormatter::switch1() void tst_CodeFormatter::switch1()
{ {
QList<Line> data; QList<Line> data;