From 1872cff611f4190c07514548affcaf924643f5f4 Mon Sep 17 00:00:00 2001 From: Denis Klychkov Date: Tue, 1 Nov 2016 12:15:26 +0300 Subject: [PATCH] QmlJS: Fix auto-indent after an opening brace placed on a new line Left brace wasn't handled in the expression_maybe_continuation state of qml/js code formatter. It led to expression_or_objectdefinition could not be continued on a new line. Task-number: QTCREATORBUG-12326 Change-Id: Id8fcaa586000008fce72c7c0c03ed1739b1c7aa1 Reviewed-by: Marco Benelli --- src/libs/qmljs/qmljscodeformatter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index ef310e07f87..d4e3bfb0843 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -300,8 +300,9 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block) case Question: case Delimiter: case LeftBracket: - case LeftParenthesis: leave(); continue; - default: leave(true); continue; + case LeftParenthesis: + case LeftBrace: leave(); continue; + default: leave(true); continue; } break; case paren_open: