diff options
author | Jeppe Dakin <jeppe_dakin@hotmail.com> | 2021-01-17 12:54:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-17 12:54:52 +0100 |
commit | 19d2096185de3282345eab1da611e56a26bcaec2 (patch) | |
tree | 1e0272fe3b9502269114deefa49e7fcc318e0d39 /pygments/lexers/python.py | |
parent | 7f48240569973617d7c7e8ece12087eb6149ad23 (diff) | |
download | pygments-git-19d2096185de3282345eab1da611e56a26bcaec2.tar.gz |
Fix for lexing Python raw f-strings with backslashes (#1683)
* introduce and apply rfstringescape
* add unit test for raw f-strings
* add further tests
* fix comment
Diffstat (limited to 'pygments/lexers/python.py')
-rw-r--r-- | pygments/lexers/python.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pygments/lexers/python.py b/pygments/lexers/python.py index f995d36f..8a9b7239 100644 --- a/pygments/lexers/python.py +++ b/pygments/lexers/python.py @@ -122,13 +122,17 @@ class PythonLexer(RegexLexer): 'expr': [ # raw f-strings ('(?i)(rf|fr)(""")', - bygroups(String.Affix, String.Double), 'tdqf'), + bygroups(String.Affix, String.Double), + combined('rfstringescape', 'tdqf')), ("(?i)(rf|fr)(''')", - bygroups(String.Affix, String.Single), 'tsqf'), + bygroups(String.Affix, String.Single), + combined('rfstringescape', 'tsqf')), ('(?i)(rf|fr)(")', - bygroups(String.Affix, String.Double), 'dqf'), + bygroups(String.Affix, String.Double), + combined('rfstringescape', 'dqf')), ("(?i)(rf|fr)(')", - bygroups(String.Affix, String.Single), 'sqf'), + bygroups(String.Affix, String.Single), + combined('rfstringescape', 'sqf')), # non-raw f-strings ('([fF])(""")', bygroups(String.Affix, String.Double), combined('fstringescape', 'tdqf')), @@ -316,9 +320,12 @@ class PythonLexer(RegexLexer): (uni_name, Name.Namespace), default('#pop'), ], - 'fstringescape': [ + 'rfstringescape': [ (r'\{\{', String.Escape), (r'\}\}', String.Escape), + ], + 'fstringescape': [ + include('rfstringescape'), include('stringescape'), ], 'stringescape': [ |