Don't introduce quotes to f-string sub-expressions on string boundaries (#871)

diff --git a/README.md b/README.md
index ead7b61e12a1700b1488259939f128bfeef20862..9d8310101af882fa600dce91daea5e8df79408c0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1034,6 +1034,9 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 * fixed bug that led *Black* format some code with a line length target
   of 1 (#762)
 
 * fixed bug that led *Black* format some code with a line length target
   of 1 (#762)
 

+* *Black* no longer introduces quotes in f-string subexpressions on string
+  boundaries (#863)
+

 
 ### 19.3b0
 
 
 ### 19.3b0
 

diff --git a/black.py b/black.py
index 7ede0b45f7908a11a453654a8d17145df60481f9..7629d9f4c2d23f09e45b16fdf83eb82f3bbf99a1 100644 (file)
--- a/black.py
+++ b/black.py
@@ -2728,7 +2728,15 @@ def normalize_string_quotes(leaf: Leaf) -> None:
         new_body = sub_twice(escaped_orig_quote, rf"\1\2{orig_quote}", new_body)
         new_body = sub_twice(unescaped_new_quote, rf"\1\\{new_quote}", new_body)
     if "f" in prefix.casefold():
         new_body = sub_twice(escaped_orig_quote, rf"\1\2{orig_quote}", new_body)
         new_body = sub_twice(unescaped_new_quote, rf"\1\\{new_quote}", new_body)
     if "f" in prefix.casefold():

-        matches = re.findall(r"[^{]\{(.*?)\}[^}]", new_body)
+        matches = re.findall(
+            r"""
+            (?:[^{]|^)\{  # start of the string or a non-{ followed by a single {
+                ([^{].*?)  # contents of the brackets except if begins with {{
+            \}(?:[^}]|$)  # A } followed by end of the string or a non-}
+            """,
+            new_body,
+            re.VERBOSE,
+        )

         for m in matches:
             if "\\" in str(m):
                 # Do not introduce backslashes in interpolated expressions
         for m in matches:
             if "\\" in str(m):
                 # Do not introduce backslashes in interpolated expressions

diff --git a/tests/data/string_quotes.py b/tests/data/string_quotes.py
index 1994dd273d92b5a9936ab22f76492a2bc1347141..6b68699c42219c276f7de037ebb4414599a5bba8 100644 (file)
--- a/tests/data/string_quotes.py
+++ b/tests/data/string_quotes.py
@@ -44,6 +44,12 @@ re.compile(r'[\\"]')
 '\\""'
 "\\''"
 'Lots of \\\\\\\\\'quotes\''
 '\\""'
 "\\''"
 'Lots of \\\\\\\\\'quotes\''

+f'{y * " "} \'{z}\''
+f'{{y * " "}} \'{z}\''
+f'\'{z}\' {y * " "}'
+f'{y * x} \'{z}\''
+'\'{z}\' {y * " "}'
+'{y * x} \'{z}\''

 
 # output
 
 
 # output
 


@@ -93,3 +99,9 @@ re.compile(r'[\\"]')
 '\\""'
 "\\''"
 "Lots of \\\\\\\\'quotes'"
 '\\""'
 "\\''"
 "Lots of \\\\\\\\'quotes'"

+f'{y * " "} \'{z}\''
+f"{{y * \" \"}} '{z}'"
+f'\'{z}\' {y * " "}'
+f"{y * x} '{z}'"
+"'{z}' {y * \" \"}"
+"{y * x} '{z}'"
\ No newline at end of file