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

QmlJS indenter: Improve indentation of function literals.

Browse Source 
Change-Id: Ic79745eefbf37e42d4dd42e73d3752bed34bbfa9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-17 13:58:00 +02:00
parent 4a487b1add
commit 3ede0687ba
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
+29 -2
View File
@@ -54,7 +54,8 @@ private Q_SLOTS:
void objectBinding();
void arrayBinding();
void functionDeclaration();
void functionExpression();
void functionExpression1();
void functionExpression2();
void propertyDeclarations();
void signalDeclarations();
void ifBinding1();
@@ -358,7 +359,7 @@ void tst_QMLCodeFormatter::functionDeclaration()
checkIndent(data);
}
void tst_QMLCodeFormatter::functionExpression()
void tst_QMLCodeFormatter::functionExpression1()
{
QList<Line> data;
data << Line("Rectangle {")
@@ -377,6 +378,32 @@ void tst_QMLCodeFormatter::functionExpression()
checkIndent(data);
}
void tst_QMLCodeFormatter::functionExpression2()
{
QList<Line> data;
data << Line("Rectangle {")
<< Line(" function foo(a, b, c) {")
<< Line(" foo(1, 123456, function() {")
<< Line(" b;")
<< Line(" })")
<< Line(" foo(1, 123456, function()")
<< Line(" {")
<< Line(" b;")
<< Line(" })")
<< Line(" foobar(1, 123456,")
<< Line(" function () {")
<< Line(" b;")
<< Line(" })")
<< Line(" var x = doo_foobar(")
<< Line(" function () {")
<< Line(" b;")
<< Line(" })")
<< Line(" }")
<< Line("}")
;
checkIndent(data);
}
void tst_QMLCodeFormatter::propertyDeclarations()
{
QList<Line> data;