Skip to content

Commit

Permalink
[clang-format] fix BreakBeforeBraces.MultiLine with for each macros
Browse files Browse the repository at this point in the history
Summary:
The MultiLine option in BreakBeforeBraces was only handling standard
control statement, leading to invalid indentation with for each macros:

Previous behavior:

/* invalid: brace should be on the same line */
Q_FOREACH(int a; list)
{
    foo();
}

/* valid */
Q_FOREACH(int longVariable;
          list)
{
    foo();
}

To fix this, simply add the TT_ForEachMacro kind in the list of
recognized control statements for the multiline option.

This is a fix for https://bugs.llvm.org/show_bug.cgi?id=44632

Reviewers: MyDeveloperDay, mitchell-stellar

Reviewed by: mitchell-stellar

Contributed by: vthib

Subscribers: cfe-commits

Tags: #clang, #clang-format, #clang-tools-extra

Differential Revision: https://reviews.llvm.org/D85304
  • Loading branch information
Mitchell Balan committed Aug 5, 2020
1 parent 4062618 commit 7ad60f6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
3 changes: 2 additions & 1 deletion clang/lib/Format/UnwrappedLineFormatter.cpp
Expand Up @@ -309,7 +309,8 @@ class LineJoiner {
// Try to merge a control statement block with left brace wrapped
if (I[1]->First->is(tok::l_brace) &&
(TheLine->First->isOneOf(tok::kw_if, tok::kw_while, tok::kw_for,
tok::kw_switch, tok::kw_try, tok::kw_do) ||
tok::kw_switch, tok::kw_try, tok::kw_do,
TT_ForEachMacro) ||
(TheLine->First->is(tok::r_brace) && TheLine->First->Next &&
TheLine->First->Next->isOneOf(tok::kw_else, tok::kw_catch))) &&
Style.BraceWrapping.AfterControlStatement ==
Expand Down
14 changes: 14 additions & 0 deletions clang/unittests/Format/FormatTest.cpp
Expand Up @@ -1663,6 +1663,20 @@ TEST_F(FormatTest, MultiLineControlStatements) {
" foo();\n"
"}",
format("for(int i=0;i<10;++i){foo();}", Style));
EXPECT_EQ("foreach (int i,\n"
" list)\n"
"{\n"
" foo();\n"
"}",
format("foreach(int i, list){foo();}", Style));
Style.ColumnLimit =
40; // to concentrate at brace wrapping, not line wrap due to column limit
EXPECT_EQ("foreach (int i, list) {\n"
" foo();\n"
"}",
format("foreach(int i, list){foo();}", Style));
Style.ColumnLimit =
20; // to concentrate at brace wrapping, not line wrap due to column limit
EXPECT_EQ("while (foo || bar ||\n"
" baz)\n"
"{\n"
Expand Down

0 comments on commit 7ad60f6

Please sign in to comment.