feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qml | Fix empty objects formatting

Browse Source 
Change-Id: I760f3420fef9ca83c2a28586575a72d580658d0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Uladzislau Paulovich
2019-06-09 02:46:14 +03:00
committed by selatnick
parent be967e1cd9
commit 8dc16d55c2
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/qmljs/qmljsreformatter.cpp
View File

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

2
tests/auto/qml/reformatter/objectliteral.js
View File

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

3
tests/auto/qml/reformatter/qmlsingleton.qml
View File

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

2
tests/auto/qml/reformatter/qmlsyntax.qml
View File

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