I != E; ++I) {
unsigned Indent =
ParentIndent + ((*I)->Level - Line.Level) * Style.IndentWidth;
- if (!DryRun)
+ if (!DryRun) {
+ unsigned Newlines = std::min((*I)->First->NewlinesBefore,
+ Style.MaxEmptyLinesToKeep + 1);
+ Newlines = std::max(1u, Newlines);
Whitespaces->replaceWhitespace(
- *(*I)->First, /*Newlines=*/1, /*Spaces=*/Indent,
+ *(*I)->First, Newlines, /*Spaces=*/Indent,
/*StartOfTokenColumn=*/Indent, Line.InPPDirective);
+ }
UnwrappedLineFormatter Formatter(Indenter, Whitespaces, Style, **I);
Penalty += Formatter.format(Indent, DryRun);
}
/*Newlines=*/0, /*Spaces=*/1,
/*StartOfTokenColumn=*/State.Column,
State.Line->InPPDirective);
+ UnwrappedLineFormatter Formatter(Indenter, Whitespaces, Style,
+ *LBrace.Children[0]);
+ Penalty += Formatter.format(State.Column + 1, DryRun);
}
State.Column += 1 + LBrace.Children[0]->Last->TotalLength;
" somethingElse();\n"
"});",
getLLVMStyleWithColumns(29)));
+ EXPECT_EQ("DEBUG({ int i; });", format("DEBUG({ int i; });"));
+ EXPECT_EQ("DEBUG({\n"
+ " int i;\n"
+ "\n"
+ " // comment\n"
+ " int j;\n"
+ "});",
+ format("DEBUG({\n"
+ " int i;\n"
+ "\n"
+ " // comment\n"
+ " int j;\n"
+ "});"));
}
TEST_F(FormatTest, PutEmptyBlocksIntoOneLine) {
verifyFormat("auto c = { [&a, &a, a] {\n"
" [=, a, b, &c] { return b++; }();\n"
"} }\n");
- verifyFormat("auto c = { [&a, &a, a] { [=, a, b, &c] { }(); } }\n");
+ verifyFormat("auto c = { [&a, &a, a] { [=, a, b, &c] {}(); } }\n");
verifyFormat("void f() {\n"
" other(x.begin(), x.end(), [&](int, int) { return 1; });\n"
"}\n");