QmlJS indenter: Improve indentation of function literals.

Change-Id: Ic79745eefbf37e42d4dd42e73d3752bed34bbfa9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp
index 5bbc32c..782e0f3 100644 (file)
--- a/src/libs/qmljs/qmljscodeformatter.cpp
+++ b/src/libs/qmljs/qmljscodeformatter.cpp
@@ -1091,6 +1091,10 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
             // undo the continuation indent of the expression
             *indentDepth = parentState.savedIndentDepth;
             *savedIndentDepth = *indentDepth;
+        } else {
+            // always align to function keyword
+            *indentDepth = tokenPosition;
+            *savedIndentDepth = *indentDepth;
         }
         break;
 

diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
index 6b8a86f..046540b 100644 (file)
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
@@ -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;