MyDeveloperDay created this revision.
MyDeveloperDay added reviewers: krasimir, JakeMerdichAMD, mitchell-stellar,
sylvestre.ledru, Abpostelnicu.
MyDeveloperDay added projects: clang, clang-format.
https://bugs.llvm.org/show_bug.cgi?id=45942
With Chromium style (although that is not important) its just it defines
PointerAligmment: Left
The following arguments `S&&` are formatted differently depending on if the
class has an attribute between it and the class identifier
class S {
S(S&&) = default;
};
class [[nodiscard]] S {
S(S &&) = default;
};
The prescense of [[nodiscard]] between the `class/struct` and the `{` causes
the `{` to be incorrectly seen as a `TT_FunctionLBrace` which in turn
transforms all the && to be `TT_BinaryOperators` rather than
`TT_PointerOrReference`, as binary operators other spacing rules come into play
causing a miss format
This revision resolves this by allowing the parseRecord to consider the
[[nodisscard]]
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D80008
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
@@ -7672,6 +7672,30 @@
MultiLineFunctions);
}
+TEST_F(FormatTest, AttributeClass) {
+ FormatStyle Style = getChromiumStyle(FormatStyle::LK_Cpp);
+ verifyFormat("class S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("class [[nodiscard]] S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("class __attribute((maybeunused)) S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("struct S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("struct [[nodiscard]] S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+}
+
TEST_F(FormatTest, AttributePenaltyBreaking) {
FormatStyle Style = getLLVMStyle();
verifyFormat("void ABCDEFGH::ABCDEFGHIJKLMN(\n"
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2401,7 +2401,7 @@
// it is often token-pasted.
while (FormatTok->isOneOf(tok::identifier, tok::coloncolon, tok::hashhash,
tok::kw___attribute, tok::kw___declspec,
- tok::kw_alignas) ||
+ tok::kw_alignas, tok::l_square, tok::r_square) ||
((Style.Language == FormatStyle::LK_Java ||
Style.Language == FormatStyle::LK_JavaScript) &&
FormatTok->isOneOf(tok::period, tok::comma))) {
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -7672,6 +7672,30 @@
MultiLineFunctions);
}
+TEST_F(FormatTest, AttributeClass) {
+ FormatStyle Style = getChromiumStyle(FormatStyle::LK_Cpp);
+ verifyFormat("class S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("class [[nodiscard]] S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("class __attribute((maybeunused)) S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("struct S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+ verifyFormat("struct [[nodiscard]] S {\n"
+ " S(S&&) = default;\n"
+ "};",
+ Style);
+}
+
TEST_F(FormatTest, AttributePenaltyBreaking) {
FormatStyle Style = getLLVMStyle();
verifyFormat("void ABCDEFGH::ABCDEFGHIJKLMN(\n"
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2401,7 +2401,7 @@
// it is often token-pasted.
while (FormatTok->isOneOf(tok::identifier, tok::coloncolon, tok::hashhash,
tok::kw___attribute, tok::kw___declspec,
- tok::kw_alignas) ||
+ tok::kw_alignas, tok::l_square, tok::r_square) ||
((Style.Language == FormatStyle::LK_Java ||
Style.Language == FormatStyle::LK_JavaScript) &&
FormatTok->isOneOf(tok::period, tok::comma))) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
