[PATCH] D85304: [clang-format] fix BreakBeforeBraces.MultiLine with for each macros
Mitchell via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Aug 5 11:32:19 PDT 2020
This revision was automatically updated to reflect the committed changes.
Closed by commit rG7ad60f6452ff: [clang-format] fix BreakBeforeBraces.MultiLine with for each macros (authored by mitchell-stellar).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D85304/new/
https://reviews.llvm.org/D85304
Files:
clang/lib/Format/UnwrappedLineFormatter.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -1663,6 +1663,20 @@
" 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"
Index: clang/lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineFormatter.cpp
+++ clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -309,7 +309,8 @@
// 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 ==
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D85304.283315.patch
Type: text/x-patch
Size: 1786 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200805/5a59e07b/attachment.bin>
More information about the cfe-commits
mailing list