Preserve trailing semicolons when using fmt: off (#8275)

crates/ruff_python_formatter/resources/test/fixtures/ruff/fmt_on_off/trailing_semicolon.py

@@ -0,0 +1,27 @@
+def f():
+    # fmt: off
+    a = 10
+
+    if True:
+        with_semicolon = 10   \
+            ;
+
+formatted   = true;
+
+
+def f():
+    # fmt: off
+
+    if True:
+        with_semicolon = 20 \
+            ; # comment
+
+
+# fmt: off
+statement = 0 \
+    ;
+# fmt: on
+a = 10
+
+# fmt: off
+last_statement_with_semi   ;

crates/ruff_python_formatter/src/verbatim.rs

@@ -395,14 +395,18 @@ fn write_suppressed_statements<'a>(
             statement = SuiteChildStatement::Other(next_statement);
             leading_node_comments = comments.leading(next_statement);
         } else {
-            let mut nodes =
+            let mut current = AnyNodeRef::from(statement.statement());
-                std::iter::successors(Some(AnyNodeRef::from(statement.statement())), |statement| {
+            // Expand the range of the statement to include any trailing comments or semicolons.
-                    statement.last_child_in_body()
+            let end = loop {
-                });
+                if let Some(comment) = comments.trailing(current).last() {
-
+                    break comment.end();
-            let end = nodes
+                } else if let Some(child) = current.last_child_in_body() {
-                .find_map(|statement| comments.trailing(statement).last().map(Ranged::end))
+                    current = child;
-                .unwrap_or(statement.end());
+                } else {
+                    break trailing_semicolon(current, source)
+                        .map_or(statement.end(), TextRange::end);
+                }
+            };
 
             FormatVerbatimStatementRange {
                 verbatim_range: TextRange::new(format_off_comment.end(), end),

crates/ruff_python_formatter/tests/snapshots/format@fmt_on_off__trailing_semicolon.py.snap

@@ -0,0 +1,69 @@
+---
+source: crates/ruff_python_formatter/tests/fixtures.rs
+input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/fmt_on_off/trailing_semicolon.py
+---
+## Input
+```py
+def f():
+    # fmt: off
+    a = 10
+
+    if True:
+        with_semicolon = 10   \
+            ;
+
+formatted   = true;
+
+
+def f():
+    # fmt: off
+
+    if True:
+        with_semicolon = 20 \
+            ; # comment
+
+
+# fmt: off
+statement = 0 \
+    ;
+# fmt: on
+a = 10
+
+# fmt: off
+last_statement_with_semi   ;
+```
+
+## Output
+```py
+def f():
+    # fmt: off
+    a = 10
+
+    if True:
+        with_semicolon = 10   \
+            ;
+
+
+formatted = true
+
+
+def f():
+    # fmt: off
+
+    if True:
+        with_semicolon = 20 \
+            ; # comment
+
+
+# fmt: off
+statement = 0 \
+    ;
+# fmt: on
+a = 10
+
+# fmt: off
+last_statement_with_semi   ;
+```
+
+
+