diff options
| author | Owen Pan <owenpiano@gmail.com> | 2025-04-13 09:01:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-13 09:01:37 -0700 |
| commit | 5f11d64cfb44fc0adf3d3235b0e480d930379e9d (patch) | |
| tree | ded80d4e0caeb581ff5ad2284aee9e39266b7a08 | |
| parent | 0a27c4e318e778b520306a9e2102e03023cfaa33 (diff) | |
| download | llvm-5f11d64cfb44fc0adf3d3235b0e480d930379e9d.zip llvm-5f11d64cfb44fc0adf3d3235b0e480d930379e9d.tar.gz llvm-5f11d64cfb44fc0adf3d3235b0e480d930379e9d.tar.bz2 | |
[clang-format] Fix a bug in AlignConsecutiveDeclarations (#135516)
Fix #109768
| -rw-r--r-- | clang/lib/Format/WhitespaceManager.cpp | 9 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp index b1e43f0..cfaadf0 100644 --- a/clang/lib/Format/WhitespaceManager.cpp +++ b/clang/lib/Format/WhitespaceManager.cpp @@ -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)) diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index bf3260c..f5c5a9e 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -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; @@ -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);", |