caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang-format] Don't align ctors and dtors with other functions (#67618)

Browse Source 
Fixed #67604.
This commit is contained in:
Owen Pan
2023-09-29 02:09:36 -07:00
committed by GitHub
parent e4114f9c0d
commit 0468fa07f8
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Format/WhitespaceManager.cpp
View File

@@ -974,7 +974,11 @@ void WhitespaceManager::alignConsecutiveDeclarations() {
AlignTokens(
Style,
[](Change const &C) {
if (C.Tok->isOneOf(TT_FunctionDeclarationName, TT_FunctionTypeLParen))
if (C.Tok->is(TT_FunctionDeclarationName) && C.Tok->Previous &&
C.Tok->Previous->isNot(tok::tilde)) {
return true;
}
if (C.Tok->is(TT_FunctionTypeLParen))
return true;
if (C.Tok->isNot(TT_StartOfName))
return false;

12
clang/unittests/Format/FormatTest.cpp
View File

@@ -18677,6 +18677,12 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
verifyFormat("int a(int x);\n"
"double b();",
Alignment);
verifyFormat("struct Test {\n"
" Test(const Test &) = default;\n"
" ~Test() = default;\n"
" Test &operator=(const Test &) = default;\n"
"};",
Alignment);
unsigned OldColumnLimit = Alignment.ColumnLimit;
// We need to set ColumnLimit to zero, in order to stress nested alignments,
// otherwise the function parameters will be re-flowed onto a single line.
@@ -18713,6 +18719,12 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
"double b();",
Alignment);
Alignment.AlignConsecutiveAssignments.Enabled = true;
verifyFormat("struct Test {\n"
" Test(const Test &) = default;\n"
" ~Test() = default;\n"
" Test &operator=(const Test &) = default;\n"
"};",
Alignment);
// Ensure recursive alignment is broken by function braces, so that the
// "a = 1" does not align with subsequent assignments inside the function
// body.