Author: Owen Pan Date: 2024-08-07T21:05:42-07:00 New Revision: 8c7a038f9029c675f2a52ff5e85f7b6005ec7b3e
URL: https://github.com/llvm/llvm-project/commit/8c7a038f9029c675f2a52ff5e85f7b6005ec7b3e DIFF: https://github.com/llvm/llvm-project/commit/8c7a038f9029c675f2a52ff5e85f7b6005ec7b3e.diff LOG: [clang-format] Fix a bug in annotating CastRParen (#102261) Fixes #102102. 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 4ed3e9d0e8e855..e1c9f37c6e8dc2 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2874,9 +2874,18 @@ class AnnotatingParser { return false; // Search for unexpected tokens. - for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) + for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) { + if (Prev->is(tok::r_paren)) { + Prev = Prev->MatchingParen; + if (!Prev) + return false; + if (Prev->is(TT_FunctionTypeLParen)) + break; + continue; + } if (!Prev->isOneOf(tok::kw_const, tok::identifier, tok::coloncolon)) return false; + } return true; } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 6b71d0d18cf7a4..cbbe550a79ebc2 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -740,6 +740,13 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) { EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_Unknown); EXPECT_TOKEN(Tokens[11], tok::amp, TT_BinaryOperator); + Tokens = annotate("func((void (*)())&a);"); + ASSERT_EQ(Tokens.size(), 15u) << Tokens; + EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionTypeLParen); + EXPECT_TOKEN(Tokens[5], tok::star, TT_PointerOrReference); + EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_CastRParen); + EXPECT_TOKEN(Tokens[10], tok::amp, TT_UnaryOperator); + auto Style = getLLVMStyle(); Style.TypeNames.push_back("Foo"); Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
