summaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authorTim Jenssen <Tim.Jenssen@qt.io>2019-06-19 20:17:29 +0200
committerTim Jenssen <tim.jenssen@qt.io>2019-06-20 08:19:10 +0000
commita3fb2051add168a3bc29f0bd4f83f1c4d6fb86a8 (patch)
tree74e18418bb7a007a00b08552fe7b8a6705853323 /src/libs
parent44f1d183077460c3e6fa2e0b533abc68e341337d (diff)
downloadqt-creator-a3fb2051add168a3bc29f0bd4f83f1c4d6fb86a8.tar.gz
QmlJS: Fix code re-formatter for property
Fixes: QTCREATORBUG-22515 Change-Id: Ie560f8cf9e43081a37f2210ea2f6df741f14ced6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/qmljs/qmljsreformatter.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index b2bb503d22..d60d6179f3 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -633,10 +633,10 @@ protected:
if (!ast->typeModifier.isNull()) {
out(ast->typeModifierToken);
out("<");
- out(ast->typeToken);
+ accept(ast->memberType);
out(">");
} else {
- out(ast->typeToken);
+ accept(ast->memberType);
}
out(" ");
if (ast->statement) {
@@ -1329,9 +1329,8 @@ protected:
{
for (FormalParameterList *it = ast; it; it = it->next) {
out(it->element->bindingIdentifier.toString()); // TODO
- if (it->next) {
+ if (it->next)
out(", ");
- }
}
return false;
}