reorder args to clause

Author: dylwil3

crates/ruff_python_formatter/src/other/except_handler_except_handler.rs

@@ -57,7 +57,6 @@ impl FormatNodeRule<ExceptHandlerExceptHandler> for FormatExceptHandlerExceptHan
             f,
             [clause(
                 ClauseHeader::ExceptHandler(item),
-                dangling_comments,
                 &format_with(|f: &mut PyFormatter| {
                     write!(
                         f,
@@ -114,6 +113,7 @@ impl FormatNodeRule<ExceptHandlerExceptHandler> for FormatExceptHandlerExceptHan
 
                     Ok(())
                 }),
+                dangling_comments,
                 body,
                 SuiteKind::other(self.last_suite_in_statement),
             )]

crates/ruff_python_formatter/src/other/match_case.rs

@@ -48,13 +48,13 @@ impl FormatNodeRule<MatchCase> for FormatMatchCase {
             f,
             [clause(
                 ClauseHeader::MatchCase(item),
-                dangling_item_comments,
                 &format_args![
                     token("case"),
                     space(),
                     maybe_parenthesize_pattern(pattern, item),
                     format_guard
                 ],
+                dangling_item_comments,
                 body,
                 SuiteKind::other(self.last_suite_in_statement),
             )]

crates/ruff_python_formatter/src/statement/clause.rs

@@ -529,8 +529,8 @@ impl<'a> FormatClause<'a, '_> {
 /// should be suppressed.
 pub(crate) fn clause<'a, 'ast, Content>(
     header: ClauseHeader<'a>,
-    trailing_colon_comment: &'a [SourceComment],
     header_formatter: &'a Content,
+    trailing_colon_comment: &'a [SourceComment],
     body: &'a Suite,
     kind: SuiteKind,
 ) -> FormatClause<'a, 'ast>

crates/ruff_python_formatter/src/statement/stmt_class_def.rs

@@ -67,7 +67,6 @@ impl FormatNodeRule<StmtClassDef> for FormatStmtClassDef {
                 },
                 clause(
                     ClauseHeader::Class(item),
-                    trailing_definition_comments,
                     &format_with(|f| {
                         write!(f, [token("class"), space(), name.format()])?;
 
@@ -132,6 +131,7 @@ impl FormatNodeRule<StmtClassDef> for FormatStmtClassDef {
 
                         Ok(())
                     }),
+                    trailing_definition_comments,
                     body,
                     SuiteKind::Class,
                 ),

crates/ruff_python_formatter/src/statement/stmt_for.rs

@@ -52,7 +52,6 @@ impl FormatNodeRule<StmtFor> for FormatStmtFor {
             f,
             [clause(
                 ClauseHeader::For(item),
-                trailing_condition_comments,
                 &format_args![
                     is_async.then_some(format_args![token("async"), space()]),
                     token("for"),
@@ -63,6 +62,7 @@ impl FormatNodeRule<StmtFor> for FormatStmtFor {
                     space(),
                     maybe_parenthesize_expression(iter, item, Parenthesize::IfBreaks),
                 ],
+                trailing_condition_comments,
                 body,
                 SuiteKind::other(orelse.is_empty()),
             ),]
@@ -81,8 +81,8 @@ impl FormatNodeRule<StmtFor> for FormatStmtFor {
                 f,
                 [clause(
                     ClauseHeader::OrElse(ElseClause::For(item)),
-                    trailing,
                     &token("else"),
+                    trailing,
                     orelse,
                     SuiteKind::other(true),
                 )

crates/ruff_python_formatter/src/statement/stmt_function_def.rs

@@ -62,8 +62,8 @@ impl FormatNodeRule<StmtFunctionDef> for FormatStmtFunctionDef {
                 },
                 clause(
                     ClauseHeader::Function(item),
-                    trailing_definition_comments,
                     &format_with(|f| format_function_header(f, item)),
+                    trailing_definition_comments,
                     body,
                     SuiteKind::Function,
                 ),

crates/ruff_python_formatter/src/statement/stmt_if.rs

@@ -28,12 +28,12 @@ impl FormatNodeRule<StmtIf> for FormatStmtIf {
             f,
             [clause(
                 ClauseHeader::If(item),
-                trailing_colon_comment,
                 &format_args![
                     token("if"),
                     space(),
                     maybe_parenthesize_expression(test, item, Parenthesize::IfBreaks),
                 ],
+                trailing_colon_comment,
                 body,
                 SuiteKind::other(elif_else_clauses.is_empty()),
             )]
@@ -78,7 +78,6 @@ pub(crate) fn format_elif_else_clause(
         [
             clause(
                 ClauseHeader::ElifElse(item),
-                trailing_colon_comment,
                 &format_with(|f: &mut PyFormatter| {
                     f.options()
                         .source_map_generation()
@@ -98,6 +97,7 @@ pub(crate) fn format_elif_else_clause(
                         token("else").fmt(f)
                     }
                 }),
+                trailing_colon_comment,
                 body,
                 suite_kind,
             )

crates/ruff_python_formatter/src/statement/stmt_try.rs

@@ -156,8 +156,8 @@ fn format_case<'a>(
             f,
             [clause(
                 header,
-                trailing_case_comments,
                 &token(kind.keyword()),
+                trailing_case_comments,
                 body,
                 SuiteKind::other(last_suite_in_statement),
             )

crates/ruff_python_formatter/src/statement/stmt_while.rs

@@ -35,12 +35,12 @@ impl FormatNodeRule<StmtWhile> for FormatStmtWhile {
             f,
             [clause(
                 ClauseHeader::While(item),
-                trailing_condition_comments,
                 &format_args![
                     token("while"),
                     space(),
                     maybe_parenthesize_expression(test, item, Parenthesize::IfBreaks),
                 ],
+                trailing_condition_comments,
                 body,
                 SuiteKind::other(orelse.is_empty()),
             )]
@@ -57,8 +57,8 @@ impl FormatNodeRule<StmtWhile> for FormatStmtWhile {
                 f,
                 [clause(
                     ClauseHeader::OrElse(ElseClause::While(item)),
-                    trailing,
                     &token("else"),
+                    trailing,
                     orelse,
                     SuiteKind::other(true),
                 )

crates/ruff_python_formatter/src/statement/stmt_with.rs

@@ -48,7 +48,6 @@ impl FormatNodeRule<StmtWith> for FormatStmtWith {
             f,
             [clause(
                 ClauseHeader::With(with_stmt),
-                colon_comments,
                 &format_with(|f| {
                     write!(
                         f,
@@ -140,6 +139,7 @@ impl FormatNodeRule<StmtWith> for FormatStmtWith {
                         .fmt(f),
                     }
                 }),
+                colon_comments,
                 &with_stmt.body,
                 SuiteKind::other(true),
             )]