This revision was automatically updated to reflect the committed changes. Closed by commit rG5b8ffb414200: [clang-format] [PR45791] BeforeLambdaBody is confused by comment inside lambda (authored by MyDeveloperDay).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D79320/new/ https://reviews.llvm.org/D79320 Files: clang/lib/Format/ContinuationIndenter.cpp clang/unittests/Format/FormatTest.cpp Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -14587,6 +14587,30 @@ LLVMWithBeforeLambdaBody); } +TEST_F(FormatTest, LambdaWithLineComments) { + FormatStyle LLVMWithBeforeLambdaBody = getLLVMStyle(); + LLVMWithBeforeLambdaBody.BreakBeforeBraces = FormatStyle::BS_Custom; + LLVMWithBeforeLambdaBody.BraceWrapping.BeforeLambdaBody = true; + LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine = + FormatStyle::ShortLambdaStyle::SLS_All; + + verifyFormat("auto k = []() { return; }", LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() // comment\n" + "{ return; }", + LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() /* comment */ { return; }", + LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() /* comment */ /* comment */ { return; }", + LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() // X\n" + "{ return; }", + LLVMWithBeforeLambdaBody); + verifyFormat( + "auto k = []() // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n" + "{ return; }", + LLVMWithBeforeLambdaBody); +} + TEST_F(FormatTest, EmptyLinesInLambdas) { verifyFormat("auto lambda = []() {\n" " x(); //\n" Index: clang/lib/Format/ContinuationIndenter.cpp =================================================================== --- clang/lib/Format/ContinuationIndenter.cpp +++ clang/lib/Format/ContinuationIndenter.cpp @@ -330,7 +330,7 @@ const FormatToken &Current = *State.NextToken; const FormatToken &Previous = *Current.Previous; if (Style.BraceWrapping.BeforeLambdaBody && Current.CanBreakBefore && - Current.is(TT_LambdaLBrace)) { + Current.is(TT_LambdaLBrace) && Previous.isNot(TT_LineComment)) { auto LambdaBodyLength = getLengthToMatchingParen(Current, State.Stack); return (LambdaBodyLength > getColumnLimit(State)); }
Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -14587,6 +14587,30 @@ LLVMWithBeforeLambdaBody); } +TEST_F(FormatTest, LambdaWithLineComments) { + FormatStyle LLVMWithBeforeLambdaBody = getLLVMStyle(); + LLVMWithBeforeLambdaBody.BreakBeforeBraces = FormatStyle::BS_Custom; + LLVMWithBeforeLambdaBody.BraceWrapping.BeforeLambdaBody = true; + LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine = + FormatStyle::ShortLambdaStyle::SLS_All; + + verifyFormat("auto k = []() { return; }", LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() // comment\n" + "{ return; }", + LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() /* comment */ { return; }", + LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() /* comment */ /* comment */ { return; }", + LLVMWithBeforeLambdaBody); + verifyFormat("auto k = []() // X\n" + "{ return; }", + LLVMWithBeforeLambdaBody); + verifyFormat( + "auto k = []() // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n" + "{ return; }", + LLVMWithBeforeLambdaBody); +} + TEST_F(FormatTest, EmptyLinesInLambdas) { verifyFormat("auto lambda = []() {\n" " x(); //\n" Index: clang/lib/Format/ContinuationIndenter.cpp =================================================================== --- clang/lib/Format/ContinuationIndenter.cpp +++ clang/lib/Format/ContinuationIndenter.cpp @@ -330,7 +330,7 @@ const FormatToken &Current = *State.NextToken; const FormatToken &Previous = *Current.Previous; if (Style.BraceWrapping.BeforeLambdaBody && Current.CanBreakBefore && - Current.is(TT_LambdaLBrace)) { + Current.is(TT_LambdaLBrace) && Previous.isNot(TT_LineComment)) { auto LambdaBodyLength = getLengthToMatchingParen(Current, State.Stack); return (LambdaBodyLength > getColumnLimit(State)); }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits