Skip to content

[clang-format] Fix a bug in AlignConsecutiveDeclarations #135516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2025
Merged

[clang-format] Fix a bug in AlignConsecutiveDeclarations #135516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions clang/lib/Format/WhitespaceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,13 +1012,8 @@ void WhitespaceManager::alignConsecutiveDeclarations() {
AlignTokens(
Style,
[&](Change const &C) {
if (Style.AlignConsecutiveDeclarations.AlignFunctionPointers) {
for (const auto *Prev = C.Tok->Previous; Prev; Prev = Prev->Previous)
if (Prev->is(tok::equal))
return false;
if (C.Tok->is(TT_FunctionTypeLParen))
return true;
}
if (C.Tok->is(TT_FunctionTypeLParen))
return Style.AlignConsecutiveDeclarations.AlignFunctionPointers;
if (C.Tok->is(TT_FunctionDeclarationName))
return Style.AlignConsecutiveDeclarations.AlignFunctionDeclarations;
if (C.Tok->isNot(TT_StartOfName))
Expand Down
12 changes: 11 additions & 1 deletion clang/unittests/Format/FormatTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20207,6 +20207,16 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
"double b();",
AlignmentLeft);

auto Style = AlignmentLeft;
Style.AlignConsecutiveDeclarations.AlignFunctionPointers = true;
Style.BinPackParameters = FormatStyle::BPPS_OnePerLine;
verifyFormat("int function_name(const wchar_t* title,\n"
" int x = 0,\n"
" long extraStyle = 0,\n"
" bool readOnly = false,\n"
" FancyClassType* module = nullptr);",
Style);

// PAS_Middle
FormatStyle AlignmentMiddle = Alignment;
AlignmentMiddle.PointerAlignment = FormatStyle::PAS_Middle;
Expand Down Expand Up @@ -20438,7 +20448,7 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
Alignment);

// See PR37175
FormatStyle Style = getMozillaStyle();
Style = getMozillaStyle();
Style.AlignConsecutiveDeclarations.Enabled = true;
verifyFormat("DECOR1 /**/ int8_t /**/ DECOR2 /**/\n"
"foo(int a);",
Expand Down