From 41bcf3df9be8e1db33357f8bedad9c800fdd7f40 Mon Sep 17 00:00:00 2001
From: Jason Owen <jason@jasonaowen.net>
Date: Sun, 10 May 2026 15:25:32 -0700
Subject: [PATCH] Include trailing comma in single param vertical fn

When formatting a function with a single parameter with
`fn_params_layout` set to `Vertical`, the previous tactic would remove
any trailing commas before spilling to multiple lines for other reasons,
such as long function names or return types. Instead, use the same
tactic as `Tall` does, so that the trailing comma is kept if the end
result spans multiple lines.

Issue #6889 `fn_params_layout = "Vertical"` removes single argument's
            trailing comma
---
 src/config/options.rs                         |  2 +-
 .../configs/fn_params_layout/vertical.rs      | 22 ++++++++++++++
 .../configs/fn_params_layout/vertical.rs      | 30 +++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/config/options.rs b/src/config/options.rs
index 00f9c3f7ec1..3c99742cabb 100644
--- a/src/config/options.rs
+++ b/src/config/options.rs
@@ -100,7 +100,7 @@ impl Density {
         match self {
             Density::Compressed => ListTactic::Mixed,
             Density::Tall => ListTactic::HorizontalVertical,
-            Density::Vertical if len == 1 => ListTactic::Horizontal,
+            Density::Vertical if len == 1 => ListTactic::HorizontalVertical,
             Density::Vertical => ListTactic::Vertical,
         }
     }
diff --git a/tests/source/configs/fn_params_layout/vertical.rs b/tests/source/configs/fn_params_layout/vertical.rs
index 674968023f9..9f4ea419d9c 100644
--- a/tests/source/configs/fn_params_layout/vertical.rs
+++ b/tests/source/configs/fn_params_layout/vertical.rs
@@ -2,6 +2,10 @@
 // Function arguments density
 
 trait Lorem {
+    fn lorem(ipsum: Ipsum);
+
+    fn lorem(ipsum: Ipsum) -> Dolor;
+
     fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet);
 
     fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet) {
@@ -13,4 +17,22 @@ trait Lorem {
     fn lorem(ipsum: Ipsum, dolor: Dolor, sit: Sit, amet: Amet, consectetur: onsectetur, adipiscing: Adipiscing, elit: Elit) {
         // body
     }
+
+    fn long_param_name(lorem_ipsum_dolor_sit_amet_consectetur_adipiscing_elit_sed_do_eiusmod: Tempor);
+
+    fn long_param_type(lorem: IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLabore,
+    );
+
+    fn long_return_type(lorem: Lorem)
+        -> IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLabore;
+
+    fn lorem_ipsum_dolor_sit_amet_consectetur_adipiscing_elit_sed_do_eiusmod_tempor_incididunt
+        (lorem: Lorem);
+
+    fn lorem<T: IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLaboreEt>(t: T);
+
+    fn lorem<T: IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLaboreEtDolore>
+    (
+        t: T,
+    );
 }
diff --git a/tests/target/configs/fn_params_layout/vertical.rs b/tests/target/configs/fn_params_layout/vertical.rs
index 7a0e42415f3..66e8cbe6f68 100644
--- a/tests/target/configs/fn_params_layout/vertical.rs
+++ b/tests/target/configs/fn_params_layout/vertical.rs
@@ -2,6 +2,10 @@
 // Function arguments density
 
 trait Lorem {
+    fn lorem(ipsum: Ipsum);
+
+    fn lorem(ipsum: Ipsum) -> Dolor;
+
     fn lorem(
         ipsum: Ipsum,
         dolor: Dolor,
@@ -39,4 +43,30 @@ trait Lorem {
     ) {
         // body
     }
+
+    fn long_param_name(
+        lorem_ipsum_dolor_sit_amet_consectetur_adipiscing_elit_sed_do_eiusmod: Tempor,
+    );
+
+    fn long_param_type(
+        lorem: IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLabore,
+    );
+
+    fn long_return_type(
+        lorem: Lorem,
+    ) -> IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLabore;
+
+    fn lorem_ipsum_dolor_sit_amet_consectetur_adipiscing_elit_sed_do_eiusmod_tempor_incididunt(
+        lorem: Lorem,
+    );
+
+    fn lorem<T: IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLaboreEt>(
+        t: T,
+    );
+
+    fn lorem<
+        T: IpsumDolorSitAmetConsecteturAdipiscingElitSedDoEiusmodTemporIncididuntUtLaboreEtDolore,
+    >(
+        t: T,
+    );
 }