clang-format: Increase penalty for breaking comments.
Unexpectedly, it seems that people commonly know what they were doing when writing a comment. Also, being more conservative about comment breaking has the advantage of giving more flexibility. If a linebreak within the comment can improve formatting, the author can add it (after which clang-format won't undo it). There is no way to override clang-format's behavior if it breaks a comment. llvm-svn: 197698
This commit is contained in:
parent
e6d79ec0eb
commit
19a541eff0
|
@ -276,7 +276,7 @@ FormatStyle getLLVMStyle() {
|
|||
LLVMStyle.ContinuationIndentWidth = 4;
|
||||
LLVMStyle.SpacesInAngles = false;
|
||||
|
||||
LLVMStyle.PenaltyBreakComment = 60;
|
||||
LLVMStyle.PenaltyBreakComment = 300;
|
||||
LLVMStyle.PenaltyBreakFirstLessLess = 120;
|
||||
LLVMStyle.PenaltyBreakString = 1000;
|
||||
LLVMStyle.PenaltyExcessCharacter = 1000000;
|
||||
|
|
|
@ -996,14 +996,14 @@ TEST_F(FormatTest, SplitsLongCxxComments) {
|
|||
format("// A comment before a macro definition\n"
|
||||
"#define a b",
|
||||
getLLVMStyleWithColumns(20)));
|
||||
EXPECT_EQ("void ffffff(int aaaaaaaaa, // wwww\n"
|
||||
" int a, int bbb, // xxxxxxx\n"
|
||||
" // yyyyyyyyy\n"
|
||||
EXPECT_EQ("void\n"
|
||||
"ffffff(int aaaaaaaaa, // wwww\n"
|
||||
" int bbbbbbbbbb, // xxxxxxx\n"
|
||||
" // yyyyyyyyyy\n"
|
||||
" int c, int d, int e) {}",
|
||||
format("void ffffff(\n"
|
||||
" int aaaaaaaaa, // wwww\n"
|
||||
" int a,\n"
|
||||
" int bbb, // xxxxxxx yyyyyyyyy\n"
|
||||
" int bbbbbbbbbb, // xxxxxxx yyyyyyyyyy\n"
|
||||
" int c, int d, int e) {}",
|
||||
getLLVMStyleWithColumns(40)));
|
||||
EXPECT_EQ("//\t aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
|
||||
|
@ -1067,8 +1067,8 @@ TEST_F(FormatTest, PriorityOfCommentBreaking) {
|
|||
format("if (xxxxxxxxxx && yyy || // aaaaaa bbbbbbbb cccc\n"
|
||||
" zzz) q();",
|
||||
getLLVMStyleWithColumns(40)));
|
||||
EXPECT_EQ("fffffffff(&xxx, // aaaaaaaaaaaa\n"
|
||||
" // bbbbbbbbbbb\n"
|
||||
EXPECT_EQ("fffffffff(\n"
|
||||
" &xxx, // aaaaaaaaaaaa bbbbbbbbbbb\n"
|
||||
" zzz);",
|
||||
format("fffffffff(&xxx, // aaaaaaaaaaaa bbbbbbbbbbb\n"
|
||||
" zzz);",
|
||||
|
|
Loading…
Reference in New Issue