================
@@ -144,14 +144,49 @@ static bool startsNextOperand(const FormatToken &Current)
{
return isAlignableBinaryOperator(Previous) && !Current.isTrailingComment();
}
+// Returns the number of operands in the chain containing \c Op.
+// For example, `a && b && c` has 3 operands (and 2 operators).
+static unsigned getChainLength(const FormatToken &Op) {
+ const FormatToken *Last = &Op;
+ while (Last->NextOperator)
+ Last = Last->NextOperator;
+ return Last->OperatorIndex + 2;
+}
+
// Returns \c true if \c Current is a binary operation that must break.
static bool mustBreakBinaryOperation(const FormatToken &Current,
const FormatStyle &Style) {
- return Style.BreakBinaryOperations != FormatStyle::BBO_Never &&
- Current.CanBreakBefore &&
- (Style.BreakBeforeBinaryOperators == FormatStyle::BOS_None
- ? startsNextOperand
- : isAlignableBinaryOperator)(Current);
+ if (!Current.CanBreakBefore)
+ return false;
+
+ // Determine the operator token: when breaking after the operator,
+ // it is Current.Previous; when breaking before, it is Current itself.
+ bool BreakBefore = Style.BreakBeforeBinaryOperators != FormatStyle::BOS_None;
+ const FormatToken *OpToken = BreakBefore ? &Current : Current.Previous;
+
+ if (!OpToken)
+ return false;
+
+ // Check that this is an alignable binary operator.
+ if (BreakBefore) {
+ if (!isAlignableBinaryOperator(Current))
+ return false;
+ } else {
+ if (!startsNextOperand(Current))
----------------
HazardyKnusperkeks wrote:
I'd merge this into an `else if`.
https://github.com/llvm/llvm-project/pull/181051
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
