Skip to content

Commit

Permalink
[clang-format] NFC ensure clang-format is itself clang-formatted
Browse files Browse the repository at this point in the history
Some patch in the past introduce this non clang-formatted change
  • Loading branch information
mydeveloperday committed Mar 29, 2023
1 parent 6330447 commit 0ca6dd9
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions clang/lib/Format/UnwrappedLineFormatter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,10 @@ class LineJoiner {
ShouldMerge = !Style.BraceWrapping.AfterClass ||
(NextLine.First->is(tok::r_brace) &&
!Style.BraceWrapping.SplitEmptyRecord);
} if(TheLine->InPPDirective ||
!TheLine->First->isOneOf(tok::kw_class, tok::kw_enum,
tok::kw_struct)) {
}
if (TheLine->InPPDirective ||
!TheLine->First->isOneOf(tok::kw_class, tok::kw_enum,
tok::kw_struct)) {
// Try to merge a block with left brace unwrapped that wasn't yet
// covered.
ShouldMerge = !Style.BraceWrapping.AfterFunction ||
Expand Down

0 comments on commit 0ca6dd9

Please sign in to comment.