llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: Owen Pan (owenca) <details> <summary>Changes</summary> Fix #<!-- -->125430 --- Full diff: https://github.com/llvm/llvm-project/pull/135520.diff 2 Files Affected: - (modified) clang/lib/Format/TokenAnnotator.cpp (+2-1) - (modified) clang/unittests/Format/FormatTest.cpp (+1) ``````````diff diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 82dc403538c45..ef5f07e2c62ee 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -5569,7 +5569,8 @@ static bool isAllmanBrace(const FormatToken &Tok) { // Returns 'true' if 'Tok' is a function argument. static bool IsFunctionArgument(const FormatToken &Tok) { return Tok.MatchingParen && Tok.MatchingParen->Next && - Tok.MatchingParen->Next->isOneOf(tok::comma, tok::r_paren); + Tok.MatchingParen->Next->isOneOf(tok::comma, tok::r_paren, + tok::r_brace); } static bool diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index bf3260c6216da..54493a731229a 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -23712,6 +23712,7 @@ TEST_F(FormatTest, FormatsLambdas) { verifyFormat("function([]() { return b; })", MergeInline); verifyFormat("function([]() { return b; }, a)", MergeInline); verifyFormat("function(a, []() { return b; })", MergeInline); + verifyFormat("auto guard = foo{[&] { exit_status = true; }};", MergeInline); // Check option "BraceWrapping.BeforeLambdaBody" and different state of // AllowShortLambdasOnASingleLine `````````` </details> https://github.com/llvm/llvm-project/pull/135520 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
