Author: Gedare Bloom Date: 2024-09-22T14:31:19-07:00 New Revision: df935ff4eca91013553edbf3ca1d45b568f6709f
URL: https://github.com/llvm/llvm-project/commit/df935ff4eca91013553edbf3ca1d45b568f6709f DIFF: https://github.com/llvm/llvm-project/commit/df935ff4eca91013553edbf3ca1d45b568f6709f.diff LOG: [clang-format] Fix regression with BlockIndent of Braced Initializers (#108717) Fixes #73584. Added: Modified: clang/lib/Format/ContinuationIndenter.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 4e9ae41b566f49..4df8dc89be459f 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -348,6 +348,13 @@ bool ContinuationIndenter::canBreak(const LineState &State) { } } + // Don't allow breaking before a closing brace of a block-indented braced list + // initializer if there isn't already a break. + if (Current.is(tok::r_brace) && Current.MatchingParen && + Current.isBlockIndentedInitRBrace(Style)) { + return CurrentState.BreakBeforeClosingBrace; + } + // If binary operators are moved to the next line (including commas for some // styles of constructor initializers), that's always ok. if (!Current.isOneOf(TT_BinaryOperator, tok::comma) && diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 53aa93a7a4fb01..5d386c1bbdbcd9 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -9441,6 +9441,11 @@ TEST_F(FormatTest, AlignsAfterOpenBracket) { " aaaaaaaaaaaaaaaa\n" ");", Style); + verifyFormat("aaaaaaa<bbbbbbbb> const aaaaaaaaaa{\n" + " aaaaaaaaaaaaa(aaaaaaaaaaa, aaaaaaaaaaaaaaaa)\n" + "};", + Style); + verifyFormat("bool aaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" " const bool &aaaaaaaaa, const void *aaaaaaaaaa\n" ") const {\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
