Loading...

XML

Word

Printable

Type: Suggestion
Resolution: Unresolved
Priority: P3: Somewhat important
Fix Version/s: 6.11
Affects Version/s: 6.8
Component/s: QML: Tooling
Labels:
None

Platform/s:

All

The ternary operator can be formatted like this:

           Key: a
                ? b
                : c

Also we need to make sure the indent for nested ternary is correct:

For this we can modify the function indentForLineStartingWithToken from qqmldomcodeformatter.cpp, for the T_COLON case:

    case QQmlJSGrammar::T_COLON:
        {
            // find the most recent '?' that was not yet closed by a colon
            // and return its indent
            QStack <int> indentStack;
            for (int i = 0;  i < oldStatus.states.length(); ++i) {
                const auto state = oldStatus.states[i];
                const StateType type = state.type;

                if (type == StateType::TernaryOp) {
                    indentStack.push(state.savedIndentDepth);
                } else if (type == StateType::TernaryOpAfterColon){
                    indentStack.pop();
                }
            }            return indentStack.length() > 0
                       ? indentStack.top()
                       : indentDepth;
        }

Also in the function handleTokens from the same file:

        case StateType::TernaryOpAfterColon:
            if(kind == QQmlJSGrammar::T_COLON){
                //leave both, TernaryOp and TernaryOpAfterColon
                leave(false);
                leave(false);
                continue;
            }