jp4a50 updated this revision to Diff 545594.
jp4a50 added a comment.
Refactor DisallowLineBreaksOnThisLine lambda.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D156259/new/
https://reviews.llvm.org/D156259
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Format/ContinuationIndenter.cpp
clang/lib/Format/ContinuationIndenter.h
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -22177,8 +22177,25 @@
" }\n"
"};");
- // Multiple lambdas in the same parentheses change indentation rules. These
- // lambdas are forced to start on new lines.
+ // Lambdas that fit on a single line within an argument list are not forced
+ // onto new lines.
+ verifyFormat("SomeFunction([] {});");
+ verifyFormat("SomeFunction(0, [] {});");
+ verifyFormat("SomeFunction([] {}, 0);");
+ verifyFormat("SomeFunction(0, [] {}, 0);");
+ verifyFormat("SomeFunction([] { return 0; }, 0);");
+ verifyFormat("SomeFunction(a, [] { return 0; }, b);");
+ verifyFormat("SomeFunction([] { return 0; }, [] { return 0; });");
+ verifyFormat("SomeFunction([] { return 0; }, [] { return 0; }, b);");
+ verifyFormat("auto loooooooooooooooooooooooooooong =\n"
+ " SomeFunction([] { return 0; }, [] { return 0; }, b);");
+ // Exceeded column limit. We need to break.
+ verifyFormat("auto loooooooooooooooooooooooooooongName = SomeFunction(\n"
+ " [] { return anotherLooooooooooonoooooooongName; }, [] { "
+ "return 0; }, b);");
+
+ // Multiple multi-line lambdas in the same parentheses change indentation
+ // rules. These lambdas are always forced to start on new lines.
verifyFormat("SomeFunction(\n"
" []() {\n"
" //\n"
@@ -22187,7 +22204,7 @@
" //\n"
" });");
- // A lambda passed as arg0 is always pushed to the next line.
+ // A multi-line lambda passed as arg0 is always pushed to the next line.
verifyFormat("SomeFunction(\n"
" [this] {\n"
" //\n"
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -5203,30 +5203,6 @@
return true;
}
- // Deal with lambda arguments in C++ - we want consistent line breaks whether
- // they happen to be at arg0, arg1 or argN. The selection is a bit nuanced
- // as aggressive line breaks are placed when the lambda is not the last arg.
- if ((Style.Language == FormatStyle::LK_Cpp ||
- Style.Language == FormatStyle::LK_ObjC) &&
- Left.is(tok::l_paren) && Left.BlockParameterCount > 0 &&
- !Right.isOneOf(tok::l_paren, TT_LambdaLSquare)) {
- // Multiple lambdas in the same function call force line breaks.
- if (Left.BlockParameterCount > 1)
- return true;
-
- // A lambda followed by another arg forces a line break.
- if (!Left.Role)
- return false;
- auto Comma = Left.Role->lastComma();
- if (!Comma)
- return false;
- auto Next = Comma->getNextNonComment();
- if (!Next)
- return false;
- if (!Next->isOneOf(TT_LambdaLSquare, tok::l_brace, tok::caret))
- return true;
- }
-
return false;
}
Index: clang/lib/Format/ContinuationIndenter.h
===================================================================
--- clang/lib/Format/ContinuationIndenter.h
+++ clang/lib/Format/ContinuationIndenter.h
@@ -433,6 +433,9 @@
/// literal sequence, 0 otherwise.
unsigned StartOfStringLiteral;
+ /// Disallow line breaks for this line.
+ bool NoLineBreak;
+
/// A stack keeping track of properties applying to parenthesis
/// levels.
SmallVector<ParenState> Stack;
Index: clang/lib/Format/ContinuationIndenter.cpp
===================================================================
--- clang/lib/Format/ContinuationIndenter.cpp
+++ clang/lib/Format/ContinuationIndenter.cpp
@@ -260,6 +260,7 @@
/*NoLineBreak=*/false));
State.NoContinuation = false;
State.StartOfStringLiteral = 0;
+ State.NoLineBreak = false;
State.StartOfLineLevel = 0;
State.LowestLevelOnLine = 0;
State.IgnoreStackForComparison = false;
@@ -342,7 +343,7 @@
return true;
}
- return !CurrentState.NoLineBreak;
+ return !State.NoLineBreak && !CurrentState.NoLineBreak;
}
bool ContinuationIndenter::mustBreak(const LineState &State) {
@@ -653,6 +654,47 @@
const FormatToken &Previous = *State.NextToken->Previous;
auto &CurrentState = State.Stack.back();
+ bool DisallowLineBreaksOnThisLine = [&Style = this->Style, &Current] {
+ // Deal with lambda arguments in C++. The aim here is to ensure that we
+ // don't over-indent lambda function bodies when lamdbas are passed as
+ // arguments to function calls. We do this by ensuring that either all
+ // arguments (including any lambdas) go on the same line as the function
+ // call, or we break before the first argument.
+ if (Style.Language != FormatStyle::LK_Cpp &&
+ Style.Language != FormatStyle::LK_ObjC)
+ return false;
+ auto PrevNonComment = Current.getPreviousNonComment();
+ if (!PrevNonComment)
+ return false;
+ if (!PrevNonComment->is(tok::l_paren))
+ return false;
+ if (Current.isOneOf(tok::comment, tok::l_paren, TT_LambdaLSquare))
+ return false;
+ auto BlockParameterCount = PrevNonComment->BlockParameterCount;
+ if (BlockParameterCount == 0)
+ return false;
+
+ if (BlockParameterCount > 1)
+ return true;
+
+ if (!PrevNonComment->Role)
+ return false;
+ auto Comma = PrevNonComment->Role->lastComma();
+ if (!Comma)
+ return false;
+ auto Next = Comma->getNextNonComment();
+ if (!Next)
+ return false;
+
+ if (!Next->isOneOf(TT_LambdaLSquare, tok::l_brace, tok::caret))
+ return true;
+
+ return false;
+ }();
+
+ if (DisallowLineBreaksOnThisLine)
+ State.NoLineBreak = true;
+
if (Current.is(tok::equal) &&
(State.Line->First->is(tok::kw_for) || Current.NestingLevel == 0) &&
CurrentState.VariablePos == 0) {
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -164,6 +164,8 @@
clang-format
------------
+- Fix a bug that erroneously placed function arguments on a new line despite
+all arguments being able to fit on the same line.
libclang
--------
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
