Skip to content

Commit

Permalink
fix: avoid formatting backslash strings inside f-strings (#4401)
Browse files Browse the repository at this point in the history
  • Loading branch information
tusharsadhwani committed Jul 11, 2024
1 parent 7e2afc9 commit 721dff5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
- Fix regression where Black failed to parse a multiline f-string containing another
multiline string (#4339)

- Fix regression where Black failed to parse an escaped single quote inside an f-string
(#4401)

- Fix bug with Black incorrectly parsing empty lines with a backslash (#4343)

### Performance
Expand Down
9 changes: 9 additions & 0 deletions src/black/linegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,15 @@ def visit_fstring(self, node: Node) -> Iterator[Line]:
# currently we don't want to format and split f-strings at all.
string_leaf = fstring_to_string(node)
node.replace(string_leaf)
if "\\" in string_leaf.value and any(
"\\" in str(child)
for child in node.children
if child.type == syms.fstring_replacement_field
):
# string normalization doesn't account for nested quotes,
# causing breakages. skip normalization when nested quotes exist
yield from self.visit_default(string_leaf)
return
yield from self.visit_STRING(string_leaf)

# TODO: Uncomment Implementation to format f-string children
Expand Down
6 changes: 6 additions & 0 deletions tests/data/cases/pep_701.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@
f"""{'''
'''}"""

f"{'\''}"
f"{f'\''}"

# output

x = f"foo"
Expand Down Expand Up @@ -258,3 +261,6 @@

f"""{'''
'''}"""

f"{'\''}"
f"{f'\''}"

0 comments on commit 721dff5

Please sign in to comment.