Revert "Avoid inserting trailing commas within f-strings" (#8576)

Reverts astral-sh/ruff#8574. This caused a bunch of ecosystem changes --
needs more work.
This commit is contained in:
Charlie Marsh 2023-11-08 21:02:04 -08:00 committed by GitHub
parent 9d1027c239
commit 9e184a9067
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 24 deletions

View file

@ -639,10 +639,3 @@ foo = namedtuple(
:20
],
)
# Make sure we don't insert commas within f-strings.
f"""This is a test. {
"Another sentence."
if True else
"Alternative route!"
}"""

View file

@ -223,24 +223,11 @@ pub(crate) fn trailing_commas(
tokens: &[LexResult],
locator: &Locator,
) {
let mut fstrings = 0u32;
let tokens = tokens
.iter()
.flatten()
.filter(|(tok, _)| match tok {
// Completely ignore comments -- they just interfere with the logic.
Tok::Comment(_) => false,
// Ignore content within f-strings.
Tok::FStringStart => {
fstrings = fstrings.saturating_add(1);
false
}
Tok::FStringEnd => {
fstrings = fstrings.saturating_sub(1);
false
}
_ => fstrings == 0,
})
.filter(|&r| !matches!(r, (Tok::Comment(_), _)))
.map(Token::from_spanned);
let tokens = [Token::irrelevant(), Token::irrelevant()]
.into_iter()