Commit 34f37fb5 authored by Christian Kamm's avatar Christian Kamm
Browse files

QmlJS indenter: Fix one-line object declarations in array bindings.

Task-number: QTCREATORBUG-2295
parent cb23999f
......@@ -101,17 +101,10 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
if (parentState.type == binding_assignment)
*savedIndentDepth = state(1).savedIndentDepth;
bool followedByData = (!lastToken && tokenAt(tokenIndex() + 1).kind != Token::Comment);
if (firstToken || followedByData)
if (firstToken)
*savedIndentDepth = tokenPosition;
*indentDepth = *savedIndentDepth;
if (followedByData) {
*indentDepth = column(tokenAt(tokenIndex() + 1).begin());
} else {
*indentDepth += m_indentSize;
}
*indentDepth = *savedIndentDepth + m_indentSize;
break;
}
......
......@@ -237,6 +237,7 @@ void tst_QMLCodeFormatter::arrayBinding()
<< Line(" State {")
<< Line(" y: x")
<< Line(" },")
<< Line(" State {},")
<< Line(" State")
<< Line(" {")
<< Line(" }")
......@@ -882,7 +883,7 @@ void tst_QMLCodeFormatter::expressionContinuation()
checkIndent(data);
}
QTEST_APPLESS_MAIN(tst_CodeFormatter)
QTEST_APPLESS_MAIN(tst_QMLCodeFormatter)
#include "tst_qmlcodeformatter.moc"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment