State.Stack.back().LastSpace = State.Column;
else if (Previous.Type == TT_InheritanceColon)
State.Stack.back().Indent = State.Column;
- else if (Previous.opensScope() && !Current.FakeLParens.empty())
- // If this function has multiple parameters or a binary expression
- // parameter, indent nested calls from the start of the first parameter.
- State.Stack.back().LastSpace = State.Column;
+ else if (Previous.opensScope()) {
+ // If a function has multiple parameters (including a single parameter
+ // that is a binary expression) or a trailing call, indented all
+ // parameters from the opening parenthesis. This avoids confusing
+ // indents like:
+ // OuterFunction(InnerFunctionCall(
+ // ParameterToInnerFunction),
+ // SecondParameterToOuterFunction);
+ bool HasMultipleParameters = !Current.FakeLParens.empty();
+ bool HasTrailingCall = false;
+ if (Previous.MatchingParen) {
+ const FormatToken *Next = Previous.MatchingParen->getNextNonComment();
+ if (Next && Next->isOneOf(tok::period, tok::arrow))
+ HasTrailingCall = true;
+ }
+ if (HasMultipleParameters || HasTrailingCall)
+ State.Stack.back().LastSpace = State.Column;
+ }
}
return moveStateToNextToken(State, DryRun);
" aaaaaaaaaaaaaaaaaaa,\n"
" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
NoBinPacking);
+
+ // If there is a subsequent call, change to hanging indentation.
+ verifyFormat(
+ "aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
+ " aaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa))\n"
+ " .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
+ verifyFormat(
+ "aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
+ " aaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa));");
}
TEST_F(FormatTest, WrapsTemplateDeclarations) {
verifyFormat("DoSomethingWithVector({ {} /* No data */ }, { { 1, 2 } });");
verifyFormat(
"someFunction(OtherParam, BracedList{\n"
- " // comment 1 (Forcing intersting break)\n"
+ " // comment 1 (Forcing interesting break)\n"
" param1, param2,\n"
" // comment 2\n"
" param3, param4\n"