https://github.com/sstwcw created
https://github.com/llvm/llvm-project/pull/164458
before
```C++
void foo(int name, // name
float name, // name
int name) // name
{}
```
after
```C++
void foo(int name, // name
float name, // name
int name) // name
{}
```
Fixes #85123.
As the bug report explained, the procedure for aligning the function parameters
previously failed to update `StartOfTokenColumn`.
>From aa2a818aae48926c61adce9ab64010ea4bb3bb08 Mon Sep 17 00:00:00 2001
From: sstwcw <[email protected]>
Date: Tue, 21 Oct 2025 16:35:27 +0000
Subject: [PATCH] [clang-format] Align trailing comments for function
parameters
before
```C++
void foo(int name, // name
float name, // name
int name) // name
{}
```
after
```C++
void foo(int name, // name
float name, // name
int name) // name
{}
```
Fixes #85123.
As the bug report explained, the procedure for aligning the function
parameters previously failed to update `StartOfTokenColumn`.
---
clang/lib/Format/WhitespaceManager.cpp | 7 +++++++
clang/unittests/Format/FormatTest.cpp | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/clang/lib/Format/WhitespaceManager.cpp
b/clang/lib/Format/WhitespaceManager.cpp
index 65fc65e79fdc3..b9a261c9e91d2 100644
--- a/clang/lib/Format/WhitespaceManager.cpp
+++ b/clang/lib/Format/WhitespaceManager.cpp
@@ -399,6 +399,13 @@ AlignTokenSequence(const FormatStyle &Style, unsigned
Start, unsigned End,
}
}
}
+
+ // The scope to be aligned may not occupy entire lines. The rest of the line
+ // needs some book-keeping.
+ for (unsigned i = End; i < Changes.size() && Changes[i].NewlinesBefore == 0;
+ ++i) {
+ Changes[i].StartOfTokenColumn += Shift;
+ }
}
// Walk through a subset of the changes, starting at StartAt, and find
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index ce68f91bef02a..9133eeb137cb9 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -19828,6 +19828,14 @@ TEST_F(FormatTest, AlignConsecutiveDeclarations) {
" Test &operator=(const Test &) = default;\n"
"};",
Alignment);
+
+ // The comment to the right should still align right.
+ verifyFormat("void foo(int name, // name\n"
+ " float name, // name\n"
+ " int name) // name\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.
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
