qmlformat: Fix inconsistent if statements

Should now produce more consistent output for if statements.

Fixes: QTBUG-82261
Change-Id: I39da0c80c4aadc2c5bdef32953c34ed9f0708a9e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 129 insertions, 0 deletions

diff --git a/tests/auto/qml/qmlformat/data/IfBlocks.formatted.qml b/tests/auto/qml/qmlformat/data/IfBlocks.formatted.qml
new file mode 100644
index 0000000000..b8e77ec23a
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/IfBlocks.formatted.qml
@@ -0,0 +1,63 @@
+Item {
+
+    function test() {
+        //// The following if blocks should NOT HAVE braces
+        // Single branch, no braces
+        if (true)
+            console.log("foo");
+
+        // Single branch, no braces
+        if (true)
+            console.log("foo");
+
+        // Multiple branches, No braces
+        if (true)
+            console.log("foo");
+        else if (false)
+            console.log("bar");
+        else
+            console.log("baz");
+        // Multiple branches, all braces
+        if (true)
+            console.log("foo");
+        else if (false)
+            console.log("bar");
+        else
+            console.log("baz");
+
+        //// The following if blocks should HAVE braces
+        // Single branch, braces
+        if (true) {
+            console.log("foo");
+            console.log("bar");
+        }
+        // Multiple branches, some braces
+        if (true) {
+            console.log("foo");
+            console.log("foo2");
+        } else if (false) {
+            console.log("bar");
+        } else {
+            console.log("baz");
+        }
+        // Multiple branches, some braces
+        if (true) {
+            console.log("foo");
+        } else if (false) {
+            console.log("bar");
+            console.log("bar2");
+        } else {
+            console.log("baz");
+        }
+        // Multiple branches, some braces
+        if (true) {
+            console.log("foo");
+        } else if (false) {
+            console.log("bar");
+        } else {
+            console.log("baz");
+            console.log("baz2");
+        }
+    }
+
+}
diff --git a/tests/auto/qml/qmlformat/data/IfBlocks.qml b/tests/auto/qml/qmlformat/data/IfBlocks.qml
new file mode 100644
index 0000000000..505988b238
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/IfBlocks.qml
@@ -0,0 +1,66 @@
+Item {
+    function test() {
+        //// The following if blocks should NOT HAVE braces
+        // Single branch, no braces
+        if (true)
+            console.log("foo");
+
+        // Single branch, no braces
+        if (true) {
+            console.log("foo");
+        }
+
+
+        // Multiple branches, No braces
+        if (true)
+            console.log("foo");
+        else if (false)
+            console.log("bar");
+        else
+            console.log("baz");
+
+        // Multiple branches, all braces
+        if (true) {
+            console.log("foo");
+        } else if (false) {
+            console.log("bar");
+        } else {
+            console.log("baz");
+        }
+
+        //// The following if blocks should HAVE braces
+        // Single branch, braces
+        if (true) {
+            console.log("foo");
+            console.log("bar");
+        }
+
+        // Multiple branches, some braces
+        if (true) {
+            console.log("foo");
+            console.log("foo2");
+        } else if (false)
+            console.log("bar");
+        else
+            console.log("baz");
+
+        // Multiple branches, some braces
+        if (true)
+            console.log("foo");
+        else if (false) {
+            console.log("bar");
+            console.log("bar2");
+        } else
+            console.log("baz");
+
+        // Multiple branches, some braces
+        if (true)
+            console.log("foo");
+        else if (false)
+            console.log("bar");
+        else {
+            console.log("baz");
+            console.log("baz2");
+        }
+    }
+}