Insert newline between docstring and following own line comment

crates/ruff_python_formatter/resources/test/fixtures/ruff/docstring.py

@@ -93,6 +93,31 @@ def docstring_that_ends_with_quote_and_a_line_break3():
     """
 
 
+class CommentAfterDocstring1:
+    """Browse module classes and functions in IDLE."""
+    # This class is also the base class for pathbrowser.PathBrowser.
+
+    def __init__(self):
+        pass
+
+
+class CommentAfterDocstring2:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+
+    def __init__(self):
+        pass
+
+
+class CommentAfterDocstring3:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+    def __init__(self):
+        pass
+
+
 class TabbedIndent:
 	def tabbed_indent(self):
 		"""check for correct tabbed formatting

crates/ruff_python_formatter/src/comments/placement.rs

@@ -1,8 +1,8 @@
 use std::cmp::Ordering;
 
 use ruff_python_ast::whitespace::indentation;
-use ruff_python_ast::AnyNodeRef;
 use ruff_python_ast::{self as ast, Comprehension, Expr, MatchCase, ModModule, Parameters};
+use ruff_python_ast::{AnyNodeRef, Constant};
 use ruff_python_trivia::{
     find_only_token_in_range, indentation_at_offset, BackwardsTokenizer, CommentRanges,
     SimpleToken, SimpleTokenKind, SimpleTokenizer,
@@ -544,6 +544,37 @@ fn handle_own_line_comment_between_statements<'a>(
         return CommentPlacement::Default(comment);
     }
 
+    if comment.line_position().is_end_of_line() {
+        return CommentPlacement::Default(comment);
+    }
+
+    // Comments after docstrings need a newline between the docstring and the comment, so we attach
+    // it as leading on the first statement after the docstring.
+    // (https://github.com/astral-sh/ruff/issues/7948)
+    // ```python
+    // class ModuleBrowser:
+    //     """Browse module classes and functions in IDLE."""
+    //     # ^ Insert a newline above here
+    //
+    //     def __init__(self, master, path, *, _htest=False, _utest=False):
+    //         pass
+    // ```
+    if let AnyNodeRef::StmtExpr(preceding_expr) = preceding {
+        // We can't use `is_docstring_stmt` here because there is no `AnyNodeRef` to `&Stmt`
+        // conversion
+        if is_first_statement_in_body(preceding, comment.enclosing_node())
+            && matches!(
+                preceding_expr.value.as_ref(),
+                Expr::Constant(ast::ExprConstant {
+                    value: Constant::Str { .. },
+                    ..
+                })
+            )
+        {
+            return CommentPlacement::leading(following, comment);
+        }
+    }
+
     // If the comment is directly attached to the following statement; make it a leading
     // comment:
     // ```python

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

@@ -99,6 +99,31 @@ def docstring_that_ends_with_quote_and_a_line_break3():
     """
 
 
+class CommentAfterDocstring1:
+    """Browse module classes and functions in IDLE."""
+    # This class is also the base class for pathbrowser.PathBrowser.
+
+    def __init__(self):
+        pass
+
+
+class CommentAfterDocstring2:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+
+    def __init__(self):
+        pass
+
+
+class CommentAfterDocstring3:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+    def __init__(self):
+        pass
+
+
 class TabbedIndent:
 	def tabbed_indent(self):
 		"""check for correct tabbed formatting
@@ -213,6 +238,32 @@ def docstring_that_ends_with_quote_and_a_line_break3():
     """he said "the news of my death have been greatly exaggerated" """
 
 
+class CommentAfterDocstring1:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+
+    def __init__(self):
+        pass
+
+
+class CommentAfterDocstring2:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+
+    def __init__(self):
+        pass
+
+
+class CommentAfterDocstring3:
+    """Browse module classes and functions in IDLE."""
+
+    # This class is also the base class for pathbrowser.PathBrowser.
+    def __init__(self):
+        pass
+
+
 class TabbedIndent:
     def tabbed_indent(self):
         """check for correct tabbed formatting
@@ -327,6 +378,32 @@ def docstring_that_ends_with_quote_and_a_line_break3():
   """he said "the news of my death have been greatly exaggerated" """
 
 
+class CommentAfterDocstring1:
+  """Browse module classes and functions in IDLE."""
+
+  # This class is also the base class for pathbrowser.PathBrowser.
+
+  def __init__(self):
+    pass
+
+
+class CommentAfterDocstring2:
+  """Browse module classes and functions in IDLE."""
+
+  # This class is also the base class for pathbrowser.PathBrowser.
+
+  def __init__(self):
+    pass
+
+
+class CommentAfterDocstring3:
+  """Browse module classes and functions in IDLE."""
+
+  # This class is also the base class for pathbrowser.PathBrowser.
+  def __init__(self):
+    pass
+
+
 class TabbedIndent:
   def tabbed_indent(self):
     """check for correct tabbed formatting
@@ -441,6 +518,32 @@ def docstring_that_ends_with_quote_and_a_line_break3():
 	"""he said "the news of my death have been greatly exaggerated" """
 
 
+class CommentAfterDocstring1:
+	"""Browse module classes and functions in IDLE."""
+
+	# This class is also the base class for pathbrowser.PathBrowser.
+
+	def __init__(self):
+		pass
+
+
+class CommentAfterDocstring2:
+	"""Browse module classes and functions in IDLE."""
+
+	# This class is also the base class for pathbrowser.PathBrowser.
+
+	def __init__(self):
+		pass
+
+
+class CommentAfterDocstring3:
+	"""Browse module classes and functions in IDLE."""
+
+	# This class is also the base class for pathbrowser.PathBrowser.
+	def __init__(self):
+		pass
+
+
 class TabbedIndent:
 	def tabbed_indent(self):
 		"""check for correct tabbed formatting
@@ -555,6 +658,32 @@ def docstring_that_ends_with_quote_and_a_line_break3():
 	"""he said "the news of my death have been greatly exaggerated" """
 
 
+class CommentAfterDocstring1:
+	"""Browse module classes and functions in IDLE."""
+
+	# This class is also the base class for pathbrowser.PathBrowser.
+
+	def __init__(self):
+		pass
+
+
+class CommentAfterDocstring2:
+	"""Browse module classes and functions in IDLE."""
+
+	# This class is also the base class for pathbrowser.PathBrowser.
+
+	def __init__(self):
+		pass
+
+
+class CommentAfterDocstring3:
+	"""Browse module classes and functions in IDLE."""
+
+	# This class is also the base class for pathbrowser.PathBrowser.
+	def __init__(self):
+		pass
+
+
 class TabbedIndent:
 	def tabbed_indent(self):
 		"""check for correct tabbed formatting