fixed formatting of commented single param in style_edition=2024 (#6840)

* fixed formatting of commented single param in style_edition=2024

Author: aznszn

src/items.rs

@@ -2586,13 +2586,13 @@ fn rewrite_fn_base(
             .map_or(false, |last_line| last_line.contains("//"));
 
         if context.config.style_edition() >= StyleEdition::Edition2024 {
-            if closing_paren_overflow_max_width {
-                result.push(')');
+            if params_last_line_contains_comment {
                 result.push_str(&indent.to_string_with_newline(context.config));
+                result.push(')');
                 no_params_and_over_max_width = true;
-            } else if params_last_line_contains_comment {
-                result.push_str(&indent.to_string_with_newline(context.config));
+            } else if closing_paren_overflow_max_width {
                 result.push(')');
+                result.push_str(&indent.to_string_with_newline(context.config));
                 no_params_and_over_max_width = true;
             } else {
                 result.push(')');

tests/source/issue-6825.rs

@@ -0,0 +1,7 @@
+// rustfmt-edition: 2024
+// rustfmt-style_edition: 2024
+pub async fn foo(
+    // OriginalUri(original_uri): OriginalUri,
+) -> Option<Option<Option<Option<String>>>> {
+    None
+}

tests/target/issue-6825.rs

@@ -0,0 +1,6 @@
+// rustfmt-edition: 2024
+// rustfmt-style_edition: 2024
+pub async fn foo(// OriginalUri(original_uri): OriginalUri,
+) -> Option<Option<Option<Option<String>>>> {
+    None
+}