language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-25 11:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disallow single-line implicit concatenated strings (#13928)

Browse source
This commit is contained in:
Micha Reiser 2024-11-03 12:49:26 +01:00 • committed by GitHub
parent ae9f08d1e5
commit 443fd3b660
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 364 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ruff_python_formatter/src/statement/stmt_assign.rs
View file

@ -20,6 +20,7 @@ use crate::preview::is_join_implicit_concatenated_string_enabled;
use crate::statement::trailing_semicolon;
use crate::string::implicit::{
FormatImplicitConcatenatedStringExpanded, FormatImplicitConcatenatedStringFlat,
ImplicitConcatenatedLayout,
};
use crate::{has_skip_comment, prelude::*};
@ -375,7 +376,13 @@ impl Format<PyFormatContext<'_>> for FormatStatementsLastExpression<'_> {
let f =
&mut WithNodeLevel::new(NodeLevel::Expression(Some(group_id)), f);
write!(f, [FormatImplicitConcatenatedStringExpanded::new(string)])
write!(
f,
[FormatImplicitConcatenatedStringExpanded::new(
string,
ImplicitConcatenatedLayout::MaybeFlat
)]
)
});
// Join the implicit concatenated string if it fits on a single line
@ -686,6 +693,7 @@ impl Format<PyFormatContext<'_>> for FormatStatementsLastExpression<'_> {
FormatImplicitConcatenatedStringExpanded::new(
StringLike::try_from(*value).unwrap(),
ImplicitConcatenatedLayout::MaybeFlat,
)
.fmt(f)
})