language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-03 18:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Gate is_multiline change behind preview (#14630)

Browse source 
## Summary

Ref:
https://github.com/astral-sh/ruff/pull/14624#pullrequestreview-2464127254

## Test Plan

The test case in the follow-up PR showcases the difference between
preview and non-preview formatting:
https://github.com/astral-sh/ruff/pull/14624/files#diff-dc25bd4df280d9a9180598075b5bc2d0bac30af956767b373561029309c8f024
This commit is contained in:
Dhruv Manilawala 2024-11-27 15:50:28 +05:30 • committed by GitHub
parent 11a2929ed7
commit 4cd2b9926e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

55
crates/ruff_python_formatter/src/string/mod.rs
View file

@ -119,42 +119,35 @@ impl StringLikeExtensions for ast::StringLike<'_> {
context.source().contains_line_break(literal.range()) context.source().contains_line_break(literal.range())
} }
ast::FStringElement::Expression(expression) => { ast::FStringElement::Expression(expression) => {
if is_f_string_formatting_enabled(context) { // Expressions containing comments can't be joined.
// Expressions containing comments can't be joined. //
// // Format specifiers needs to be checked as well. For example, the
// Format specifiers needs to be checked as well. For example, the // following should be considered multiline because the literal
// following should be considered multiline because the literal // part of the format specifier contains a newline at the end
// part of the format specifier contains a newline at the end // (`.3f\n`):
// (`.3f\n`): //
// // ```py
// ```py // x = f"hello {a + b + c + d:.3f
// x = f"hello {a + b + c + d:.3f // } world"
// } world" // ```
// ``` context.comments().contains_comments(expression.into())
context.comments().contains_comments(expression.into()) || expression.format_spec.as_deref().is_some_and(|spec| {
|| expression.format_spec.as_deref().is_some_and(|spec| { contains_line_break_or_comments(&spec.elements, context)
contains_line_break_or_comments(&spec.elements, context) })
}) || expression.debug_text.as_ref().is_some_and(|debug_text| {
|| expression.debug_text.as_ref().is_some_and(|debug_text| { memchr2(b'\n', b'\r', debug_text.leading.as_bytes()).is_some()
memchr2(b'\n', b'\r', debug_text.leading.as_bytes()) || memchr2(b'\n', b'\r', debug_text.trailing.as_bytes())
.is_some() .is_some()
|| memchr2(b'\n', b'\r', debug_text.trailing.as_bytes()) })
.is_some()
})
} else {
// Multiline f-string expressions can't be joined if the f-string
// formatting is disabled because the string gets inserted in
// verbatim preserving the newlines.
//
// We don't need to check format specifiers or debug text here
// because the expression range already includes them.
context.source().contains_line_break(expression.range())
}
} }
}) })
} }
contains_line_break_or_comments(&f_string.elements, context) if is_f_string_formatting_enabled(context) {
contains_line_break_or_comments(&f_string.elements, context)
} else {
context.source().contains_line_break(f_string.range())
}
} }
}) })
} }