Commit 5ac981a0 authored by Christian Kamm's avatar Christian Kamm
Browse files

C++ indenter: Fix indentation after namespace aliases.

Task-number: QTCREATORBUG-2574
Reviewed-by: Roberto Raggi
parent 3c94a898
......@@ -93,6 +93,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
case namespace_start:
switch (kind) {
case T_LBRACE: enter(namespace_open); break;
case T_SEMICOLON:
case T_RBRACE: leave(); break;
} break;
......
......@@ -51,6 +51,7 @@ private Q_SLOTS:
void forStatement();
void templateSingleline();
void macrosNoSemicolon2();
void renamedNamespace();
};
struct Line {
......@@ -985,6 +986,20 @@ void tst_CodeFormatter::macrosNoSemicolon2()
checkIndent(data);
}
void tst_CodeFormatter::renamedNamespace()
{
QList<Line> data;
data
<< Line("namespace X = Y;")
<< Line("void foo()")
<< Line("{")
<< Line(" return;")
<< Line("}")
<< Line("int i;")
;
checkIndent(data);
}
QTEST_APPLESS_MAIN(tst_CodeFormatter)
#include "tst_codeformatter.moc"
......
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