Author: Björn Schäpers Date: 2026-03-28T16:00:53Z New Revision: 3f42ec658f2f08d8ce11909603c8a82dc9e1045a
URL: https://github.com/llvm/llvm-project/commit/3f42ec658f2f08d8ce11909603c8a82dc9e1045a DIFF: https://github.com/llvm/llvm-project/commit/3f42ec658f2f08d8ce11909603c8a82dc9e1045a.diff LOG: [clang-format] Fix annotation of references in function pointer typedefs (#188860) Fixes #188695 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 646182a673129..1ba0d7e891b09 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2758,7 +2758,7 @@ class AnnotatingParser { if (BeforeRParen == LParen || !AfterRParen) return false; - if (LParen->is(TT_OverloadedOperatorLParen)) + if (LParen->isOneOf(TT_OverloadedOperatorLParen, TT_FunctionTypeLParen)) return false; auto *LeftOfParens = LParen->getPreviousNonComment(); diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index efb361387bb1e..98a2c80c5c820 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -427,6 +427,12 @@ TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmp) { ASSERT_EQ(Tokens.size(), 7u) << Tokens; EXPECT_TOKEN(Tokens[1], tok::star, TT_PointerOrReference); EXPECT_TOKEN(Tokens[3], tok::star, TT_PointerOrReference); + + Tokens = annotate("FuncPointerType = MCStreamer *(*)(MCContext &Ctx);"); + ASSERT_EQ(Tokens.size(), 14u) << Tokens; + EXPECT_TOKEN(Tokens[6], tok::r_paren, TT_Unknown); // Not TT_CastRParen + EXPECT_TOKEN(Tokens[9], tok::amp, TT_PointerOrReference); + EXPECT_TOKEN(Tokens[10], tok::identifier, TT_StartOfName); } TEST_F(TokenAnnotatorTest, UnderstandsUsesOfPlusAndMinus) { _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
