Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify a bit further

This commit is contained in:
Brent Westbrook 2025-12-09 16:51:55 -05:00
parent f639389e6a
commit 9d683da964
No known key found for this signature in database
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ruff_python_formatter/src/comments/placement.rs
View File

@ -857,14 +857,6 @@ fn handle_parameter_comment<'a>(
parameter: &'a Parameter,
source: &str,
) -> CommentPlacement<'a> {
let parameters = if let Some(AnyNodeRef::Parameters(parameters)) = comment.enclosing_parent()
&& parameters.start() == parameter.start()
{
Some(parameters)
} else {
None
};
if parameter.annotation().is_some() {
let colon = first_non_trivia_token(parameter.name.end(), source).expect(
"A annotated parameter should have a colon following its name when it is valid syntax.",
@ -880,7 +872,13 @@ fn handle_parameter_comment<'a>(
CommentPlacement::Default(comment)
}
} else if comment.start() < parameter.name.start() {
if let Some(parameters) = parameters {
// For lambdas, where the parameters cannot be parenthesized and the first parameter thus
// starts at the same position as the parent parameters, mark a comment before the first
// parameter as leading on the parameters rather than the individual parameter to prevent
// the whole parameter list from breaking.
if let Some(AnyNodeRef::Parameters(parameters)) = comment.enclosing_parent()
&& parameters.start() == parameter.start()
{
CommentPlacement::leading(parameters, comment)
} else {
CommentPlacement::leading(parameter, comment)