[PATCH] D97137: Bug fix of clang-format, the AlignConsecutiveDeclarations option doesn't handle pointer properly
Darwin Xu via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Feb 22 08:28:44 PST 2021
darwin updated this revision to Diff 325455.
darwin added a comment.
Add more test cases.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D97137/new/
https://reviews.llvm.org/D97137
Files:
clang/lib/Format/WhitespaceManager.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -13945,6 +13945,20 @@
verifyFormat("int oneTwoThree{0}; // comment\n"
"unsigned oneTwo; // comment",
Alignment);
+ verifyFormat("unsigned int * a;\n"
+ "int * b;\n"
+ "unsigned int Const *c;\n"
+ "unsigned int const *d;\n"
+ "unsigned int Const &e;\n"
+ "unsigned int const &f;",
+ Alignment);
+ verifyFormat("Const unsigned int *c;\n"
+ "const unsigned int *d;\n"
+ "Const unsigned int &e;\n"
+ "const unsigned int &f;\n"
+ "const unsigned g;\n"
+ "Const unsigned h;",
+ Alignment);
EXPECT_EQ("float const a = 5;\n"
"\n"
"int oneTwoThree = 123;",
@@ -14249,6 +14263,38 @@
EXPECT_EQ("DECOR1 /**/ int8_t /**/ DECOR2 /**/\n"
"foo(int a);",
format("DECOR1 /**/ int8_t /**/ DECOR2 /**/ foo (int a);", Style));
+
+ Alignment.PointerAlignment = FormatStyle::PAS_Left;
+ verifyFormat("unsigned int* a;\n"
+ "int* b;\n"
+ "unsigned int Const* c;\n"
+ "unsigned int const* d;\n"
+ "unsigned int Const& e;\n"
+ "unsigned int const& f;",
+ Alignment);
+ verifyFormat("Const unsigned int* c;\n"
+ "const unsigned int* d;\n"
+ "Const unsigned int& e;\n"
+ "const unsigned int& f;\n"
+ "const unsigned g;\n"
+ "Const unsigned h;",
+ Alignment);
+
+ Alignment.PointerAlignment = FormatStyle::PAS_Middle;
+ verifyFormat("unsigned int * a;\n"
+ "int * b;\n"
+ "unsigned int Const * c;\n"
+ "unsigned int const * d;\n"
+ "unsigned int Const & e;\n"
+ "unsigned int const & f;",
+ Alignment);
+ verifyFormat("Const unsigned int * c;\n"
+ "const unsigned int * d;\n"
+ "Const unsigned int & e;\n"
+ "const unsigned int & f;\n"
+ "const unsigned g;\n"
+ "Const unsigned h;",
+ Alignment);
}
TEST_F(FormatTest, LinuxBraceBreaking) {
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -709,6 +709,8 @@
for (FormatToken *Next = C.Tok->Next; Next; Next = Next->Next) {
if (Next->is(tok::comment))
continue;
+ if (Next->is(TT_PointerOrReference))
+ return false;
if (!Next->Tok.getIdentifierInfo())
break;
if (Next->isOneOf(TT_StartOfName, TT_FunctionDeclarationName,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D97137.325455.patch
Type: text/x-patch
Size: 3100 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20210222/573e1a45/attachment.bin>
More information about the cfe-commits
mailing list