/// will either all be on the same line or will have one line each.
bool BinPackParameters;
- /// \brief Allow putting all parameters of a function declaration/call onto
- /// the next line without calling this bin-packing.
- bool AllowAllParametersOnNextLine;
+ /// \brief Allow putting all parameters of a function declaration onto
+ /// the next line even if \c BinPackParameters is \c false.
+ bool AllowAllParametersOfDeclarationOnNextLine;
/// \brief Allow putting the return type of a function onto its own line.
bool AllowReturnTypeOnItsOwnLine;
LLVMStyle.IndentCaseLabels = false;
LLVMStyle.SpacesBeforeTrailingComments = 1;
LLVMStyle.BinPackParameters = true;
- LLVMStyle.AllowAllParametersOnNextLine = true;
+ LLVMStyle.AllowAllParametersOfDeclarationOnNextLine = true;
LLVMStyle.AllowReturnTypeOnItsOwnLine = true;
LLVMStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = false;
LLVMStyle.AllowShortIfStatementsOnASingleLine = false;
GoogleStyle.IndentCaseLabels = true;
GoogleStyle.SpacesBeforeTrailingComments = 2;
GoogleStyle.BinPackParameters = false;
- GoogleStyle.AllowAllParametersOnNextLine = true;
+ GoogleStyle.AllowAllParametersOfDeclarationOnNextLine = true;
GoogleStyle.AllowReturnTypeOnItsOwnLine = false;
GoogleStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
GoogleStyle.AllowShortIfStatementsOnASingleLine = false;
FormatStyle getChromiumStyle() {
FormatStyle ChromiumStyle = getGoogleStyle();
- ChromiumStyle.AllowAllParametersOnNextLine = false;
+ ChromiumStyle.AllowAllParametersOfDeclarationOnNextLine = false;
ChromiumStyle.SplitTemplateClosingGreater = true;
return ChromiumStyle;
}
if (!Style.BinPackParameters && Newline) {
// If we are breaking after '(', '{', '<', this is not bin packing unless
- // AllowAllParametersOnNextLine is false.
+ // AllowAllParametersOfDeclarationOnNextLine is false.
if ((Previous.isNot(tok::l_paren) && Previous.isNot(tok::l_brace) &&
Previous.Type != TT_TemplateOpener) ||
- !Style.AllowAllParametersOnNextLine)
+ (!Style.AllowAllParametersOfDeclarationOnNextLine &&
+ Line.MustBeDeclaration))
State.Stack.back().BreakAfterComma = true;
// Any break on this level means that the parent level has been broken
" a);");
FormatStyle Style = getGoogleStyle();
- Style.AllowAllParametersOnNextLine = false;
- verifyFormat("aaaaaaaaaaaaaaa(aaaaaaaaa,\n"
+ Style.AllowAllParametersOfDeclarationOnNextLine = false;
+ verifyFormat("void aaaaaaaaaa(aaaaaaaaa,\n"
" aaaaaaaaa,\n"
- " aaaaaaaaaaaaaaaaaaaaa).aaaaaaaaaaaaaaaaaa();",
+ " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
+ Style);
+ verifyFormat("void f() {\n"
+ " aaaaaaaaaaaaaaaaaaaaaaaa(\n"
+ " aaaaaaaaa, aaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa).aaaaaaa();\n"
+ "}",
Style);
}