[PATCH] D124589: [clang-format] Fix a bug that misformats Access Specifier after *[]
Owen Pan via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon May 2 01:39:58 PDT 2022
This revision was automatically updated to reflect the committed changes.
Closed by commit rGc8603db0711e: [clang-format] Fix a bug that misformats Access Specifier after *[] (authored by owenpan).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D124589/new/
https://reviews.llvm.org/D124589
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -3336,6 +3336,14 @@
verifyFormat("if (public == private)\n");
verifyFormat("void foo(public, private)");
verifyFormat("public::foo();");
+
+ verifyFormat("class A {\n"
+ "public:\n"
+ " std::unique_ptr<int *[]> b() { return nullptr; }\n"
+ "\n"
+ "private:\n"
+ " int c;\n"
+ "};");
}
TEST_F(FormatTest, SeparatesLogicalBlocks) {
@@ -21487,6 +21495,7 @@
" bar([]() {} // Did not respect SpacesBeforeTrailingComments\n"
" );\n"
"}");
+ verifyFormat("auto k = *[](int *j) { return j; }(&i);");
// Lambdas created through weird macros.
verifyFormat("void f() {\n"
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2048,6 +2048,11 @@
nextToken();
if (FormatTok->is(tok::l_square))
return false;
+ if (FormatTok->is(tok::r_square)) {
+ const FormatToken *Next = Tokens->peekNextToken();
+ if (Next && Next->is(tok::greater))
+ return false;
+ }
parseSquare(/*LambdaIntroducer=*/true);
return true;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D124589.426355.patch
Type: text/x-patch
Size: 1445 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220502/360f1820/attachment.bin>
More information about the cfe-commits
mailing list