From 8dc16d55c26af46101365434f0f29847c3959cc7 Mon Sep 17 00:00:00 2001
From: Uladzislau Paulovich <selatnick@gmail.com>
Date: Sun, 9 Jun 2019 02:46:14 +0300
Subject: [PATCH] qml | Fix empty objects formatting

Change-Id: I760f3420fef9ca83c2a28586575a72d580658d0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/qmljs/qmljsreformatter.cpp         | 11 +++++++----
 tests/auto/qml/reformatter/objectliteral.js |  2 ++
 tests/auto/qml/reformatter/qmlsingleton.qml |  3 +--
 tests/auto/qml/reformatter/qmlsyntax.qml    |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index 94898532472..deea5d94048 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/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;
     }
diff --git a/tests/auto/qml/reformatter/objectliteral.js b/tests/auto/qml/reformatter/objectliteral.js
index 37f68633746..d260712166d 100644
--- a/tests/auto/qml/reformatter/objectliteral.js
+++ b/tests/auto/qml/reformatter/objectliteral.js
@@ -10,3 +10,5 @@ var x = {
     },
     "z": 12
 }
+
+var empty_object = {}
diff --git a/tests/auto/qml/reformatter/qmlsingleton.qml b/tests/auto/qml/reformatter/qmlsingleton.qml
index d64f554097c..05a08e7de40 100644
--- a/tests/auto/qml/reformatter/qmlsingleton.qml
+++ b/tests/auto/qml/reformatter/qmlsingleton.qml
@@ -2,5 +2,4 @@ pragma Singleton
 
 import QtQuick 2.0
 
-Item {
-}
+Item {}
diff --git a/tests/auto/qml/reformatter/qmlsyntax.qml b/tests/auto/qml/reformatter/qmlsyntax.qml
index ded863106a7..8717aba35d5 100644
--- a/tests/auto/qml/reformatter/qmlsyntax.qml
+++ b/tests/auto/qml/reformatter/qmlsyntax.qml
@@ -45,4 +45,6 @@ Text {
     function foo(a, b) {
         x = a + 12 * b
     }
+
+    value: Rectangle {}
 }