qmlformat: Enforce more of the coding conventions

Now also enforces:
- states and transitions being the last elements in an object
- large bindings being the last bindings

Change-Id: I8be1db4eb2bc9dd429dd5b9abab70a1362f47dfb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

5 files changed, 58 insertions, 0 deletions

diff --git a/tests/auto/qml/qmlformat/data/largeBindings.formatted.qml b/tests/auto/qml/qmlformat/data/largeBindings.formatted.qml
new file mode 100644
index 0000000000..d8e4ffb087
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/largeBindings.formatted.qml
@@ -0,0 +1,9 @@
+QtObject {
+    small1: 3
+    small2: foo
+    // THIS NEEDS TO BE LAST
+    largeBinding: {
+        var x = 300;
+        console.log(x);
+    }
+}
diff --git a/tests/auto/qml/qmlformat/data/largeBindings.qml b/tests/auto/qml/qmlformat/data/largeBindings.qml
new file mode 100644
index 0000000000..a2249f6815
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/largeBindings.qml
@@ -0,0 +1,11 @@
+QtObject
+{
+    // THIS NEEDS TO BE LAST
+    largeBinding: {
+        var x = 300;
+        console.log(x);
+    }  
+
+    small1: 3
+    small2: foo
+}
diff --git a/tests/auto/qml/qmlformat/data/statesAndTransitions.formatted.qml b/tests/auto/qml/qmlformat/data/statesAndTransitions.formatted.qml
new file mode 100644
index 0000000000..bd063ac498
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/statesAndTransitions.formatted.qml
@@ -0,0 +1,16 @@
+QtObject {
+    id: foo
+
+    // This needs to be *before* states and transitions after formatting
+    Item {
+    }
+
+    states: [
+        State {
+        }
+    ]
+    transitions: [
+        Transition {
+        }
+    ]
+}
diff --git a/tests/auto/qml/qmlformat/data/statesAndTransitions.qml b/tests/auto/qml/qmlformat/data/statesAndTransitions.qml
new file mode 100644
index 0000000000..648bdce6b9
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/statesAndTransitions.qml
@@ -0,0 +1,10 @@
+QtObject {
+    id: foo
+
+    states: [ State {} ]
+    transitions: [ Transition {} ]
+
+    // This needs to be *before* states and transitions after formatting
+    Item {}
+
+}
diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
index b10eaf26f1..c7714304b8 100644
--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
@@ -43,6 +43,8 @@ private Q_SLOTS:
     void testFormatNoSort();
 
     void testReadOnlyProps();
+    void testStatesAndTransitions();
+    void testLargeBindings();
 
 #if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
     void testExample();
@@ -188,6 +190,16 @@ void TestQmlformat::testReadOnlyProps()
     QCOMPARE(runQmlformat(testFile("readOnlyProps.qml"), false, true), readTestFile("readOnlyProps.formatted.qml"));
 }
 
+void TestQmlformat::testStatesAndTransitions()
+{
+    QCOMPARE(runQmlformat(testFile("statesAndTransitions.qml"), false, true), readTestFile("statesAndTransitions.formatted.qml"));
+}
+
+void TestQmlformat::testLargeBindings()
+{
+    QCOMPARE(runQmlformat(testFile("largeBindings.qml"), false, true), readTestFile("largeBindings.formatted.qml"));
+}
+
 #if !defined(QTEST_CROSS_COMPILED) // sources not available when cross compiled
 void TestQmlformat::testExample_data()
 {