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

Fixes #1469
This commit is contained in:
Bryan Bugyi 2021-05-30 18:34:33 -04:00 committed by GitHub
parent 4ca4407b4a
commit 199e3eb76b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions

View File

@ -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)
- Fix regular expression that black uses to identify f-expressions (#2287)
### _Blackd_

View File

@ -971,8 +971,8 @@ class StringSplitter(CustomSplitMapMixin, BaseStringSplitter):
| \{\{
| \}\}
| (?R)
)+?
(?<!\}) \} (?:\}\})* (?!\})
)+
\}
"""
def do_splitter_match(self, line: Line) -> TMatchResult:

View File

@ -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$', "
@ -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$', "