Author: Marek Kurdej Date: 2022-03-17T09:36:25+01:00 New Revision: dc142ea184a526fb2879f84c4c82fff195d36b9d
URL: https://github.com/llvm/llvm-project/commit/dc142ea184a526fb2879f84c4c82fff195d36b9d DIFF: https://github.com/llvm/llvm-project/commit/dc142ea184a526fb2879f84c4c82fff195d36b9d.diff LOG: [clang-format] Correctly recognize binary operators in template arguments with parenthesized literals. Fixes https://github.com/llvm/llvm-project/issues/24602. Before, code like `foo<b & 1>` was formatted correctly but `foo<b & (1)>` wasn't. This patch fixes this inconsistency. Reviewed By: HazardyKnusperkeks, owenpan Differential Revision: https://reviews.llvm.org/D121846 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index f1ff1995c806d..9c94590dc0b9a 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2177,14 +2177,21 @@ class AnnotatingParser { if (PrevToken->Tok.isLiteral() || PrevToken->isOneOf(tok::r_paren, tok::r_square, tok::kw_true, - tok::kw_false, tok::r_brace) || - NextToken->Tok.isLiteral() || - NextToken->isOneOf(tok::kw_true, tok::kw_false) || - NextToken->isUnaryOperator() || - // If we know we're in a template argument, there are no named - // declarations. Thus, having an identifier on the right-hand side - // indicates a binary operator. - (InTemplateArgument && NextToken->Tok.isAnyIdentifier())) + tok::kw_false, tok::r_brace)) + return TT_BinaryOperator; + + const FormatToken *NextNonParen = NextToken; + while (NextNonParen && NextNonParen->is(tok::l_paren)) + NextNonParen = NextNonParen->getNextNonComment(); + if (NextNonParen && (NextNonParen->Tok.isLiteral() || + NextNonParen->isOneOf(tok::kw_true, tok::kw_false) || + NextNonParen->isUnaryOperator())) + return TT_BinaryOperator; + + // If we know we're in a template argument, there are no named declarations. + // Thus, having an identifier on the right-hand side indicates a binary + // operator. + if (InTemplateArgument && NextToken->Tok.isAnyIdentifier()) return TT_BinaryOperator; // "&&(" is quite unlikely to be two successive unary "&". @@ -4508,12 +4515,11 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, // We only break before r_paren if we're in a block indented context. if (Right.is(tok::r_paren)) { - if (Style.AlignAfterOpenBracket == FormatStyle::BAS_BlockIndent) { + if (Style.AlignAfterOpenBracket == FormatStyle::BAS_BlockIndent) return Right.MatchingParen && !(Right.MatchingParen->Previous && (Right.MatchingParen->Previous->is(tok::kw_for) || Right.MatchingParen->Previous->isIf())); - } return false; } diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 469252a252887..4ef4c9a8612a7 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -10333,6 +10333,11 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("vector<a * b> v;"); verifyFormat("foo<b && false>();"); verifyFormat("foo<b & 1>();"); + verifyFormat("foo<b & (1)>();"); + verifyFormat("foo<b & (~0)>();"); + verifyFormat("foo<b & (true)>();"); + verifyFormat("foo<b & ((1))>();"); + verifyFormat("foo<b & (/*comment*/ 1)>();"); verifyFormat("decltype(*::std::declval<const T &>()) void F();"); verifyFormat("typeof(*::std::declval<const T &>()) void F();"); verifyFormat("_Atomic(*::std::declval<const T &>()) void F();"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits