Author: Owen Pan Date: 2024-09-17T21:19:56-07:00 New Revision: 4d18ce1dd2640829c3ad9cbb31e6ff92e2e29438
URL: https://github.com/llvm/llvm-project/commit/4d18ce1dd2640829c3ad9cbb31e6ff92e2e29438 DIFF: https://github.com/llvm/llvm-project/commit/4d18ce1dd2640829c3ad9cbb31e6ff92e2e29438.diff LOG: [clang-format] Handle C-style cast of qualified type (#108929) Fixes #102874. 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 580f183419f78f..6f09835bad3a83 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2840,11 +2840,14 @@ class AnnotatingParser { if (AfterRParen->isOneOf(tok::identifier, tok::kw_this)) return true; - // Look for a cast `( x ) (`. - if (AfterRParen->is(tok::l_paren) && BeforeRParen->Previous) { - if (BeforeRParen->is(tok::identifier) && - BeforeRParen->Previous->is(tok::l_paren)) { - return true; + // Look for a cast `( x ) (`, where x may be a qualified identifier. + if (AfterRParen->is(tok::l_paren)) { + for (const auto *Prev = BeforeRParen; Prev->is(tok::identifier);) { + Prev = Prev->Previous; + if (Prev->is(tok::coloncolon)) + Prev = Prev->Previous; + if (Prev == LParen) + return true; } } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index baa5ab0ac5e456..34c03d668a9a0a 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -781,6 +781,14 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) { EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_Unknown); EXPECT_TOKEN(Tokens[10], tok::minus, TT_BinaryOperator); + Tokens = annotate("return (::Type)(1 + 2);"); + ASSERT_EQ(Tokens.size(), 12u) << Tokens; + EXPECT_TOKEN(Tokens[4], tok::r_paren, TT_CastRParen); + + Tokens = annotate("return (Namespace::Class)(1 + 2);"); + ASSERT_EQ(Tokens.size(), 13u) << Tokens; + EXPECT_TOKEN(Tokens[5], tok::r_paren, TT_CastRParen); + 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
