From a3fb2051add168a3bc29f0bd4f83f1c4d6fb86a8 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <Tim.Jenssen@qt.io>
Date: Wed, 19 Jun 2019 20:17:29 +0200
Subject: [PATCH] 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>
---
 src/libs/qmljs/qmljsreformatter.cpp      | 7 +++----
 tests/auto/qml/reformatter/qmlsyntax.qml | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index b2bb503d22e..d60d6179f3d 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;
     }
diff --git a/tests/auto/qml/reformatter/qmlsyntax.qml b/tests/auto/qml/reformatter/qmlsyntax.qml
index 8717aba35d5..3e555030490 100644
--- a/tests/auto/qml/reformatter/qmlsyntax.qml
+++ b/tests/auto/qml/reformatter/qmlsyntax.qml
@@ -9,6 +9,8 @@ Text {
     property int foo
     property alias bar: x
     property list<QtObject> pro
+    property Part.Particles particles
+    property list<Part.Particles> particlesList
     default property int def
     property var baz: Rectangle {
         width: 20