From abb7d4cb53691cca3ecf557e27e537f1e23072c3 Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Tue, 22 May 2018 17:53:20 +0200 Subject: [PATCH] QmlJs: fix indentation in object literals Handle properly ternary operator inside object literals Task-number: QTCREATORBUG-7103 Change-Id: I482fb77a606f929528147c2b3939fcade77ae40f Reviewed-by: Thomas Hartmann --- src/libs/qmljs/qmljscodeformatter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index 41b910703fe..973338395cf 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -290,7 +290,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) if (tryInsideExpression()) break; switch (kind) { - case Comma: + case Comma: leave(true); break; case Delimiter: enter(expression_continuation); break; case RightBracket: case RightParenthesis: leave(); continue; @@ -342,11 +342,11 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) if (tryInsideExpression()) break; switch (kind) { + case Comma: leave(); break; case Delimiter: enter(expression_continuation); break; case RightBracket: case RightParenthesis: leave(); continue; // error recovery case RightBrace: leave(); continue; // so we also leave objectliteral_open - case Comma: leave(); break; } break; case bracket_element_start: