[clang-format][NFC] Merge another two calls to isOneOf

[curdeius]

clang/lib/Format/ContinuationIndenter.cpp

1290–1293

Unrelated to your change, it only shed light on this:
This condition looks strange to me. How can Previous be at the same time two different TokenTypes (?), for instance, both TT_BinaryOperator and TT_DictLiteral?

Shouldn't it be this?

[HazardyKnusperkeks]

clang/lib/Format/ContinuationIndenter.cpp

1290–1293

Yeah, I will update it.

[MyDeveloperDay]

clang/lib/Format/ContinuationIndenter.cpp

1290–1293

This is in my view one of the reasons why I personally like it when we comment the condition with an example and don't have these huge compound expressions.

Often they are covering corner cases. (we should call them out)

[HazardyKnusperkeks]

Incorporated feedback.

[curdeius]

LGTM.

clang/lib/Format/ContinuationIndenter.cpp

unsigned ContinuationIndenter::moveStateToNextToken(LineState &State,
   if (Current.isNot(tok::comment) && Previous &&
       Previous->isOneOf(tok::l_brace, TT_ArrayInitializerLSquare) &&
       !Previous->is(TT_DictLiteral) && State.Stack.size() > 1 &&
       !State.Stack.back().HasMultipleNestedBlocks) {
     if (State.Stack[State.Stack.size() - 2].NestedBlockInlined && Newline)
       for (unsigned i = 0, e = State.Stack.size() - 1; i != e; ++i)
         State.Stack[i].NoLineBreak = true;
     State.Stack[State.Stack.size() - 2].NestedBlockInlined = false;
   }
-  if (Previous &&
-      (Previous->isOneOf(tok::l_paren, tok::comma, tok::colon) ||
-       Previous->isOneOf(TT_BinaryOperator, TT_ConditionalExpr)) &&
-      !Previous->isOneOf(TT_DictLiteral, TT_ObjCMethodExpr)) {
+  if (Previous && (Previous->isOneOf(TT_BinaryOperator, TT_ConditionalExpr) ||
+                   (Previous->isOneOf(tok::l_paren, tok::comma, tok::colon) &&
+                    !Previous->isOneOf(TT_DictLiteral, TT_ObjCMethodExpr)))) {
     State.Stack.back().NestedBlockInlined =
         !Newline && hasNestedBlockInlined(Previous, Current, Style);
   }
 
   moveStatePastFakeLParens(State, Newline);
   moveStatePastScopeCloser(State);
   bool AllowBreak = !State.Stack.back().NoLineBreak &&
                     !State.Stack.back().NoLineBreakInOperand;