MyDeveloperDay created this revision.
MyDeveloperDay added reviewers: curdeius, HazardyKnusperkeks, darwin.
MyDeveloperDay added projects: clang, clang-format.
MyDeveloperDay requested review of this revision.
https://bugs.llvm.org/show_bug.cgi?id=50525
AlignConsecutiveAssignments/Declarations cause incorrect alignment in the
presence of a DesignatedInitializerPeriod
(https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html)
static NTSTATUS stg(PLW_STREAM Stream, int identity)
{
NTSTATUS status;
BYTE payload[256] = {'l', 'h', 'o', 't', 's', 'e'};
struct dm_rpc_header header = {.drh_magic = DRH_MAGIC,
.drh_op_code = RPC_OP_ECHO,
.drh_payload_size = sizeof(payload),
.drh_body_size = sizeof(payload),
.drh_request_id = 1};
header.drh_version = identity;
This fix addresses that by ensuring the period isn't ignored
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D104900
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
@@ -16180,6 +16180,52 @@
// clang-format on
}
+TEST_F(FormatTest, AlignWithInitializerPeriods) {
+ auto Style = getLLVMStyleWithColumns(60);
+
+ verifyFormat("void foo1(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+
+ Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
+ Style.AlignConsecutiveDeclarations = FormatStyle::ACS_None;
+ verifyFormat("void foo2(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+
+ Style.AlignConsecutiveAssignments = FormatStyle::ACS_None;
+ Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
+ verifyFormat("void foo3(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+
+ Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
+ Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
+ verifyFormat("void foo4(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+}
+
TEST_F(FormatTest, LinuxBraceBreaking) {
FormatStyle LinuxBraceStyle = getLLVMStyle();
LinuxBraceStyle.BreakBeforeBraces = FormatStyle::BS_Linux;
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -353,6 +353,10 @@
if (Changes[i].Tok->is(TT_ConditionalExpr))
return true;
+ // Period Initializer .XXX = 1.
+ if (Changes[i].Tok->is(TT_DesignatedInitializerPeriod))
+ return true;
+
// Continued ternary operator
if (Changes[i].Tok->Previous &&
Changes[i].Tok->Previous->is(TT_ConditionalExpr))
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -16180,6 +16180,52 @@
// clang-format on
}
+TEST_F(FormatTest, AlignWithInitializerPeriods) {
+ auto Style = getLLVMStyleWithColumns(60);
+
+ verifyFormat("void foo1(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+
+ Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
+ Style.AlignConsecutiveDeclarations = FormatStyle::ACS_None;
+ verifyFormat("void foo2(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+
+ Style.AlignConsecutiveAssignments = FormatStyle::ACS_None;
+ Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
+ verifyFormat("void foo3(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+
+ Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
+ Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
+ verifyFormat("void foo4(void) {\n"
+ " BYTE p[1] = 1;\n"
+ " A B = {.one_foooooooooooooooo = 2,\n"
+ " .two_fooooooooooooo = 3,\n"
+ " .three_fooooooooooooo = 4};\n"
+ " BYTE payload = 2;\n"
+ "}",
+ Style);
+}
+
TEST_F(FormatTest, LinuxBraceBreaking) {
FormatStyle LinuxBraceStyle = getLLVMStyle();
LinuxBraceStyle.BreakBeforeBraces = FormatStyle::BS_Linux;
Index: clang/lib/Format/WhitespaceManager.cpp
===================================================================
--- clang/lib/Format/WhitespaceManager.cpp
+++ clang/lib/Format/WhitespaceManager.cpp
@@ -353,6 +353,10 @@
if (Changes[i].Tok->is(TT_ConditionalExpr))
return true;
+ // Period Initializer .XXX = 1.
+ if (Changes[i].Tok->is(TT_DesignatedInitializerPeriod))
+ return true;
+
// Continued ternary operator
if (Changes[i].Tok->Previous &&
Changes[i].Tok->Previous->is(TT_ConditionalExpr))
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
