rymiel created this revision. rymiel added a project: clang-format. rymiel added reviewers: MyDeveloperDay, HazardyKnusperkeks, owenpan. Herald added a project: All. rymiel requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
clang-format already has logic to threat the right-hand side of an equals sign. This patch applies that logic to template defaults, which are likely to be non-template type parameters in which case the default value should be annotated as an expression. This should mostly only ever apply to bool and &&. Fixes https://github.com/llvm/llvm-project/issues/61664 Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D146760 Files: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Index: clang/unittests/Format/TokenAnnotatorTest.cpp =================================================================== --- clang/unittests/Format/TokenAnnotatorTest.cpp +++ clang/unittests/Format/TokenAnnotatorTest.cpp @@ -253,6 +253,14 @@ "};"); ASSERT_EQ(Tokens.size(), 30u) << Tokens; EXPECT_TOKEN(Tokens[14], tok::ampamp, TT_BinaryOperator); + + Tokens = annotate("template <bool B = C && D> struct S {};"); + ASSERT_EQ(Tokens.size(), 15u) << Tokens; + EXPECT_TOKEN(Tokens[6], tok::ampamp, TT_BinaryOperator); + + Tokens = annotate("template <typename T, bool B = C && D> struct S {};"); + ASSERT_EQ(Tokens.size(), 18u) << Tokens; + EXPECT_TOKEN(Tokens[9], tok::ampamp, TT_BinaryOperator); } TEST_F(TokenAnnotatorTest, UnderstandsUsesOfPlusAndMinus) { Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -1719,6 +1719,11 @@ return false; } + // This is the default value of a non-template type parameter, so treat + // it as an expression. + if (Contexts.back().ContextKind == tok::less) + return true; + Tok = Tok->MatchingParen; if (!Tok) return false;
Index: clang/unittests/Format/TokenAnnotatorTest.cpp =================================================================== --- clang/unittests/Format/TokenAnnotatorTest.cpp +++ clang/unittests/Format/TokenAnnotatorTest.cpp @@ -253,6 +253,14 @@ "};"); ASSERT_EQ(Tokens.size(), 30u) << Tokens; EXPECT_TOKEN(Tokens[14], tok::ampamp, TT_BinaryOperator); + + Tokens = annotate("template <bool B = C && D> struct S {};"); + ASSERT_EQ(Tokens.size(), 15u) << Tokens; + EXPECT_TOKEN(Tokens[6], tok::ampamp, TT_BinaryOperator); + + Tokens = annotate("template <typename T, bool B = C && D> struct S {};"); + ASSERT_EQ(Tokens.size(), 18u) << Tokens; + EXPECT_TOKEN(Tokens[9], tok::ampamp, TT_BinaryOperator); } TEST_F(TokenAnnotatorTest, UnderstandsUsesOfPlusAndMinus) { Index: clang/lib/Format/TokenAnnotator.cpp =================================================================== --- clang/lib/Format/TokenAnnotator.cpp +++ clang/lib/Format/TokenAnnotator.cpp @@ -1719,6 +1719,11 @@ return false; } + // This is the default value of a non-template type parameter, so treat + // it as an expression. + if (Contexts.back().ContextKind == tok::less) + return true; + Tok = Tok->MatchingParen; if (!Tok) return false;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits