QmlJS indenter: Fix indentation for property initializers.

property int foo: {

used to start an object literal but is a block statement now.

Change-Id: I9ffbce4927b444314f1a43aba65ca3d9d234e47c
Reviewed-on: http://codereview.qt-project.org/4339
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

1 files changed, 1 insertions, 16 deletions

diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp
index 32ab5585da..eb7e61642d 100644
--- a/src/libs/qmljs/qmljscodeformatter.cpp
+++ b/src/libs/qmljs/qmljscodeformatter.cpp
@@ -166,21 +166,6 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             default:            enter(expression); continue;
             } break;
 
-        // property inits don't take statements
-        case property_initializer:
-            switch (kind) {
-            case Semicolon:     leave(true); break;
-            case LeftBrace:     enter(objectliteral_open); break;
-            case On:
-            case As:
-            case List:
-            case Import:
-            case Signal:
-            case Property:
-            case Identifier:    enter(expression_or_objectdefinition); break;
-            default:            enter(expression); continue;
-            } break;
-
         case objectdefinition_open:
             switch (kind) {
             case RightBrace:    leave(true); break;
@@ -222,7 +207,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
 
         case property_maybe_initializer:
             switch (kind) {
-            case Colon:         enter(property_initializer); break;
+            case Colon:         turnInto(binding_assignment); break;
             default:            leave(true); continue;
             } break;