llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: owenca (owenca) <details> <summary>Changes</summary> Fixes #<!-- -->180179 --- Full diff: https://github.com/llvm/llvm-project/pull/180436.diff 2 Files Affected: - (modified) clang/lib/Format/TokenAnnotator.cpp (+1-1) - (modified) clang/unittests/Format/TokenAnnotatorTest.cpp (+8) ``````````diff diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 3208d8e28dd86..1803bbbaeeff4 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2921,7 +2921,7 @@ class AnnotatingParser { if (!AfterRParen->Next) return false; - if (AfterRParen->is(tok::l_brace) && + if (Style.Language != FormatStyle::LK_C && AfterRParen->is(tok::l_brace) && AfterRParen->getBlockKind() == BK_BracedInit) { return true; } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index b3e127c3eb6ba..defd78aedfd70 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -964,6 +964,14 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) { EXPECT_TOKEN(Tokens[11], tok::amp, TT_UnaryOperator); } +TEST_F(TokenAnnotatorTest, CompoundLiteral) { + auto Tokens = + annotate("return (struct foo){};", getLLVMStyle(FormatStyle::LK_C)); + ASSERT_EQ(Tokens.size(), 9u) << Tokens; + // Not TT_CastRParen. + EXPECT_TOKEN(Tokens[4], tok::r_paren, TT_Unknown); +} + TEST_F(TokenAnnotatorTest, UnderstandsDynamicExceptionSpecifier) { auto Tokens = annotate("void f() throw(int);"); ASSERT_EQ(Tokens.size(), 10u) << Tokens; `````````` </details> https://github.com/llvm/llvm-project/pull/180436 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
