mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-16 00:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix incorect placement of trailing stub function comments (#11632)

Browse source
This commit is contained in:
Micha Reiser 2024-05-31 14:06:17 +02:00 • committed by GitHub
parent 889667ad84
commit 9b6d2ce1f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 142 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff_python_formatter/src/statement/stmt_class_def.rs
View file

@ -55,7 +55,7 @@ impl FormatNodeRule<StmtClassDef> for FormatStmtClassDef {
// newline between the comment and the node, but we _require_ two newlines. If there are
// _no_ newlines between the comment and the node, we don't insert _any_ newlines; if there
// are more than two, then `leading_comments` will preserve the correct number of newlines.
empty_lines_after_leading_comments(f, comments.leading(item)).fmt(f)?;
empty_lines_after_leading_comments(comments.leading(item)).fmt(f)?;
write!(
f,
@ -152,7 +152,7 @@ impl FormatNodeRule<StmtClassDef> for FormatStmtClassDef {
//
// # comment
// ```
empty_lines_before_trailing_comments(f, comments.trailing(item), NodeKind::StmtClassDef)
empty_lines_before_trailing_comments(comments.trailing(item), NodeKind::StmtClassDef)
.fmt(f)?;
Ok(())

4
crates/ruff_python_formatter/src/statement/stmt_function_def.rs
View file

@ -52,7 +52,7 @@ impl FormatNodeRule<StmtFunctionDef> for FormatStmtFunctionDef {
// newline between the comment and the node, but we _require_ two newlines. If there are
// _no_ newlines between the comment and the node, we don't insert _any_ newlines; if there
// are more than two, then `leading_comments` will preserve the correct number of newlines.
empty_lines_after_leading_comments(f, comments.leading(item)).fmt(f)?;
empty_lines_after_leading_comments(comments.leading(item)).fmt(f)?;
write!(
f,
@ -86,7 +86,7 @@ impl FormatNodeRule<StmtFunctionDef> for FormatStmtFunctionDef {
//
// # comment
// ```
empty_lines_before_trailing_comments(f, comments.trailing(item), NodeKind::StmtFunctionDef)
empty_lines_before_trailing_comments(comments.trailing(item), NodeKind::StmtFunctionDef)
.fmt(f)
}
}

3
crates/ruff_python_formatter/src/statement/suite.rs
View file

@ -240,7 +240,8 @@ impl FormatRule<Suite, PyFormatContext<'_>> for FormatSuite {
preceding_stub.end(),
f.context().source(),
) < 2
});
})
&& !preceding_comments.has_trailing_own_line();
if !is_preceding_stub_function_without_empty_line {
match self.kind {