qml | Fix empty objects formatting

Change-Id: I760f3420fef9ca83c2a28586575a72d580658d0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

src/libs/qmljs/qmljsreformatter.cpp

@@ -594,9 +594,10 @@ protected:
     bool visit(UiObjectInitializer *ast) override
     {
         out(ast->lbraceToken);
-        if (ast->members)
+        if (ast->members) {
             lnAcceptIndented(ast->members);
-        newLine();
+            newLine();
+        }
         out(ast->rbraceToken);
         return false;
     }
@@ -708,8 +709,10 @@ protected:
     bool visit(ObjectPattern *ast) override
     {
         out(ast->lbraceToken);
-        lnAcceptIndented(ast->properties);
-        newLine();
+        if (ast->properties) {
+            lnAcceptIndented(ast->properties);
+            newLine();
+        }
         out(ast->rbraceToken);
         return false;
     }

tests/auto/qml/reformatter/objectliteral.js

@@ -10,3 +10,5 @@ var x = {
     },
     "z": 12
 }
+
+var empty_object = {}

tests/auto/qml/reformatter/qmlsingleton.qml

@@ -2,5 +2,4 @@ pragma Singleton
 
 import QtQuick 2.0
 
-Item {
-}
+Item {}

tests/auto/qml/reformatter/qmlsyntax.qml

@@ -45,4 +45,6 @@ Text {
     function foo(a, b) {
         x = a + 12 * b
     }
+
+    value: Rectangle {}
 }