Skip to content

Commit 1c816f5

Browse files
committed
Revert bad version number change in docs, break lines in test string literals.
1 parent 48ed2cf commit 1c816f5

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

clang/include/clang/Format/Format.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3788,7 +3788,7 @@ struct FormatStyle {
37883788
};
37893789

37903790
/// \brief Comment reformatting style.
3791-
/// \version 20
3791+
/// \version 3.8
37923792
ReflowCommentsStyle ReflowComments;
37933793

37943794
/// Remove optional braces of control statements (``if``, ``else``, ``for``,

clang/unittests/Format/FormatTestComments.cpp

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,14 @@ TEST_F(FormatTestComments, CommentReflowingCanBeTurnedOff) {
496496
Style.ReflowComments = FormatStyle::RCS_Never;
497497
verifyNoChange("// aaaaaaaaa aaaaaaaaaa aaaaaaaaaa", Style);
498498
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa */", Style);
499-
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\naaaaaaaaa*/", Style);
500-
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n aaaaaaaaa*/", Style);
501-
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n * aaaaaaaaa*/",
499+
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"
500+
"aaaaaaaaa*/",
501+
Style);
502+
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"
503+
" aaaaaaaaa*/",
504+
Style);
505+
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"
506+
" * aaaaaaaaa*/",
502507
Style);
503508
}
504509

@@ -507,10 +512,16 @@ TEST_F(FormatTestComments, CommentReflowingCanApplyOnlyToIndents) {
507512
Style.ReflowComments = FormatStyle::RCS_IndentOnly;
508513
verifyNoChange("// aaaaaaaaa aaaaaaaaaa aaaaaaaaaa", Style);
509514
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa */", Style);
510-
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\naaaaaaaaa*/", Style);
511-
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n aaaaaaaaa*/", Style);
512-
verifyFormat("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n * aaaaaaaaa*/",
513-
"/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n * aaaaaaaaa*/",
515+
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa"
516+
"\naaaaaaaaa*/",
517+
Style);
518+
verifyNoChange("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"
519+
" aaaaaaaaa*/",
520+
Style);
521+
verifyFormat("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"
522+
" * aaaaaaaaa*/",
523+
"/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"
524+
" * aaaaaaaaa*/",
514525
Style);
515526
}
516527

0 commit comments

Comments
 (0)