[PATCH] D94906: [clang-format] Apply Allman style to lambdas
Björn Schäpers via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Jan 19 09:18:07 PST 2021
This revision was automatically updated to reflect the committed changes.
Closed by commit rGcbdde495ba28: [clang-format] Apply Allman style to lambdas (authored by HazardyKnusperkeks).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D94906/new/
https://reviews.llvm.org/D94906
Files:
clang/lib/Format/Format.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -13481,6 +13481,58 @@
"#endif",
AllmanBraceStyle);
+ EXPECT_EQ(AllmanBraceStyle.AllowShortLambdasOnASingleLine,
+ FormatStyle::SLS_All);
+
+ verifyFormat("[](int i) { return i + 2; };\n"
+ "[](int i, int j)\n"
+ "{\n"
+ " auto x = i + j;\n"
+ " auto y = i * j;\n"
+ " return x ^ y;\n"
+ "};\n"
+ "void foo()\n"
+ "{\n"
+ " auto shortLambda = [](int i) { return i + 2; };\n"
+ " auto longLambda = [](int i, int j)\n"
+ " {\n"
+ " auto x = i + j;\n"
+ " auto y = i * j;\n"
+ " return x ^ y;\n"
+ " };\n"
+ "}",
+ AllmanBraceStyle);
+
+ AllmanBraceStyle.AllowShortLambdasOnASingleLine = FormatStyle::SLS_None;
+
+ verifyFormat("[](int i)\n"
+ "{\n"
+ " return i + 2;\n"
+ "};\n"
+ "[](int i, int j)\n"
+ "{\n"
+ " auto x = i + j;\n"
+ " auto y = i * j;\n"
+ " return x ^ y;\n"
+ "};\n"
+ "void foo()\n"
+ "{\n"
+ " auto shortLambda = [](int i)\n"
+ " {\n"
+ " return i + 2;\n"
+ " };\n"
+ " auto longLambda = [](int i, int j)\n"
+ " {\n"
+ " auto x = i + j;\n"
+ " auto y = i * j;\n"
+ " return x ^ y;\n"
+ " };\n"
+ "}",
+ AllmanBraceStyle);
+
+ // Reset
+ AllmanBraceStyle.AllowShortLambdasOnASingleLine = FormatStyle::SLS_All;
+
// This shouldn't affect ObjC blocks..
verifyFormat("[self doSomeThingWithACompletionHandler:^{\n"
" // ...\n"
Index: clang/lib/Format/Format.cpp
===================================================================
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -801,6 +801,7 @@
Expanded.IndentExternBlock = FormatStyle::IEBS_AfterExternBlock;
Expanded.BraceWrapping.BeforeCatch = true;
Expanded.BraceWrapping.BeforeElse = true;
+ Expanded.BraceWrapping.BeforeLambdaBody = true;
break;
case FormatStyle::BS_Whitesmiths:
Expanded.BraceWrapping.AfterCaseLabel = true;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D94906.317601.patch
Type: text/x-patch
Size: 2617 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20210119/c75a50d1/attachment-0001.bin>
More information about the cfe-commits
mailing list