Fix regular expression that black uses to identify f-expressions (#2287)

Fixes #1469

diff --git a/CHANGES.md b/CHANGES.md
index c761d14624acf1f8c68dae73d14408b4b71012c2..392569822150a5922ba5cf914409c5fb1e5610e5 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@
 - Add extra uvloop install + import support if in python env (#2258)
 - Fix --experimental-string-processing crash when matching parens are not found (#2283)
 - Make sure to split lines that start with a string operator (#2286)
 - Add extra uvloop install + import support if in python env (#2258)
 - Fix --experimental-string-processing crash when matching parens are not found (#2283)
 - Make sure to split lines that start with a string operator (#2286)

+- Fix regular expression that black uses to identify f-expressions (#2287)

 
 ### _Blackd_
 
 
 ### _Blackd_
 

diff --git a/src/black/trans.py b/src/black/trans.py
index 80e88a2d2fb78d834ed281256b8b3dd97511a16a..fd0de72762042bf96418178891d3f4a7928c86ab 100644 (file)
--- a/src/black/trans.py
+++ b/src/black/trans.py
@@ -971,8 +971,8 @@ class StringSplitter(CustomSplitMapMixin, BaseStringSplitter):
             | \{\{
             | \}\}
             | (?R)
             | \{\{
             | \}\}
             | (?R)

-        )+?
-    (?<!\}) \} (?:\}\})* (?!\})
+        )+
+    \}

     """
 
     def do_splitter_match(self, line: Line) -> TMatchResult:
     """
 
     def do_splitter_match(self, line: Line) -> TMatchResult:

diff --git a/tests/data/long_strings__regression.py b/tests/data/long_strings__regression.py
index bd7b635132175710c390db23f611214155d108d4..cd8053f9eb5813627f5c2c26a3fdb2dde80f6297 100644 (file)
--- a/tests/data/long_strings__regression.py
+++ b/tests/data/long_strings__regression.py
@@ -407,6 +407,12 @@ def _legacy_listen_examples():
     )
 
 
     )
 
 

+temp_msg = (
+    f"{f'{humanize_number(pos)}.': <{pound_len+2}} "
+    f"{balance: <{bal_len + 5}} "
+    f"<<{author.display_name}>>\n"
+)
+

 assert str(suffix_arr) == (
     "['$', 'angaroo$', 'angrykangaroo$', 'aroo$', 'garoo$', "
     "'grykangaroo$', 'kangaroo$', 'ngaroo$', 'ngrykangaroo$', "
 assert str(suffix_arr) == (
     "['$', 'angaroo$', 'angrykangaroo$', 'aroo$', 'garoo$', "
     "'grykangaroo$', 'kangaroo$', 'ngaroo$', 'ngrykangaroo$', "


@@ -942,6 +948,12 @@ def _legacy_listen_examples():
     )
 
 
     )
 
 

+temp_msg = (
+    f"{f'{humanize_number(pos)}.': <{pound_len+2}} "
+    f"{balance: <{bal_len + 5}} "
+    f"<<{author.display_name}>>\n"
+)
+

 assert (
     str(suffix_arr)
     == "['$', 'angaroo$', 'angrykangaroo$', 'aroo$', 'garoo$', "
 assert (
     str(suffix_arr)
     == "['$', 'angaroo$', 'angrykangaroo$', 'aroo$', 'garoo$', "