Skip to content

[clang-format] Fix a bug in indenting lambda trailing arrows #94560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 10, 2024
Merged

[clang-format] Fix a bug in indenting lambda trailing arrows #94560

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
624e74b
fix incorrectly indents lambda trailing return
c8ef Jun 6, 2024
ec31943
address CR issue
c8ef Jun 7, 2024
2624354
address CR comment
c8ef Jun 8, 2024
87b0444
address CR comment
c8ef Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions clang/lib/Format/ContinuationIndenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,11 @@ unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
!Current.isOneOf(tok::colon, tok::comment)) {
return ContinuationIndent;
}
if (Style.isCpp() && Current.is(TT_TrailingReturnArrow) &&
Copy link
Contributor

@HazardyKnusperkeks HazardyKnusperkeks Jun 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also think you can drop the isCpp.

Copy link
Contributor Author

@c8ef c8ef Jun 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Previous.isOneOf(tok::kw_noexcept, tok::kw_mutable, tok::kw_constexpr,
tok::kw_consteval, tok::kw_static)) {
return ContinuationIndent;
}
if (Current.is(TT_ProtoExtensionLSquare))
return CurrentState.Indent;
if (Current.isBinaryOperator() && CurrentState.UnindentOperator) {
Expand Down
28 changes: 28 additions & 0 deletions clang/unittests/Format/FormatTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22858,6 +22858,34 @@ TEST_F(FormatTest, FormatsLambdas) {
" //\n"
" });");

verifyFormat("int main() {\n"
" very_long_function_name_yes_it_is_really_long(\n"
" [](auto n)\n"
" -> std::unordered_map<very_long_type_name_A,\n"
" very_long_type_name_B> {\n"
" really_do_something();\n"
" });\n"
"}",
getLLVMStyleWithColumns(60));
verifyFormat("int main() {\n"
" very_long_function_name_yes_it_is_really_long(\n"
" [](auto n) noexcept\n"
" -> std::unordered_map<very_long_type_name_A,\n"
" very_long_type_name_B> {\n"
" really_do_something();\n"
" });\n"
"}",
getLLVMStyleWithColumns(60));
verifyFormat("int main() {\n"
" very_long_function_name_yes_it_is_really_long(\n"
" [](auto n) constexpr\n"
" -> std::unordered_map<very_long_type_name_A,\n"
" very_long_type_name_B> {\n"
" really_do_something();\n"
" });\n"
"}",
getLLVMStyleWithColumns(60));

FormatStyle DoNotMerge = getLLVMStyle();
DoNotMerge.AllowShortLambdasOnASingleLine = FormatStyle::SLS_None;
verifyFormat("auto c = []() {\n"
Expand Down