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

QmlJS: Fix code re-formatter for property

Browse Source 
Fixes: QTCREATORBUG-22515
Change-Id: Ie560f8cf9e43081a37f2210ea2f6df741f14ced6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tim Jenssen
2019-06-19 20:17:29 +02:00
committed by Tim Jenssen
parent 44f1d18307
commit a3fb2051ad
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,10 +633,10 @@ protected:
if (!ast->typeModifier.isNull()) { if (!ast->typeModifier.isNull()) {
out(ast->typeModifierToken); out(ast->typeModifierToken);
out("<"); out("<");
out(ast->typeToken); accept(ast->memberType);
out(">"); out(">");
} else { } else {
out(ast->typeToken); accept(ast->memberType);
} }
out(" "); out(" ");
if (ast->statement) { if (ast->statement) {
@@ -1329,9 +1329,8 @@ protected:
{ {
for (FormalParameterList *it = ast; it; it = it->next) { for (FormalParameterList *it = ast; it; it = it->next) {
out(it->element->bindingIdentifier.toString()); // TODO out(it->element->bindingIdentifier.toString()); // TODO
if (it->next) { if (it->next)
out(", "); out(", ");
}
} }
return false; return false;
} }

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

@@ -9,6 +9,8 @@ Text {
property int foo property int foo
property alias bar: x property alias bar: x
property list<QtObject> pro property list<QtObject> pro
property Part.Particles particles
property list<Part.Particles> particlesList
default property int def default property int def
property var baz: Rectangle { property var baz: Rectangle {
width: 20 width: 20