[fix] missing case for raw f-strings

baron/grouper.py

@@ -54,7 +54,7 @@ def group_generator(sequence):
             current += next(iterator)
         if current in list('uUfFrRbB') and str(iterator.show_next()).startswith(('"', "'")):
             current += next(iterator)
-        if str(current).lower() in ["ur", "br", "fr"] and str(iterator.show_next()).startswith(('"', "'")):
+        if str(current).lower() in ["ur", "br", "fr", "rf"] and str(iterator.show_next()).startswith(('"', "'")):
             current += next(iterator)
         if any([re.match(x, current) for x in (r'^\d+[eE]$', r'^\d+\.\d*[eE]$', r'^\.\d+[eE]$')]):
             current += next(iterator)

baron/tokenizer.py

@@ -86,6 +86,7 @@ TOKENS = (
     (r'[uU][rR]["\'](.|\n|\r)*["\']', 'UNICODE_RAW_STRING'),
     (r'[bB][rR]["\'](.|\n|\r)*["\']', 'BINARY_RAW_STRING'),
     (r'[fF][rR]["\'](.|\n|\r)*["\']', 'INTERPOLATED_RAW_STRING'),
+    (r'[rR][fF]["\'](.|\n|\r)*["\']', 'INTERPOLATED_RAW_STRING'),
 )

tests/test_tokenizer.py

@@ -329,6 +329,15 @@ def test_interpolated_raw_string():
     match("FR'{(lambda x: x*2)(3)}'", 'INTERPOLATED_RAW_STRING')
     match("FR'{(lambda x: x*2)(3)}'", 'INTERPOLATED_RAW_STRING')
+    match("rf'He said his name is {name!r}.'", 'INTERPOLATED_RAW_STRING')
+    match("rf'The value is {value}.'", 'INTERPOLATED_RAW_STRING')
+    match('rF"He said his name is {name!r}."', 'INTERPOLATED_RAW_STRING')
+    match('Rf"The value is {value}."', 'INTERPOLATED_RAW_STRING')
+    match("RF'{date} was on a {date:%A}'", 'INTERPOLATED_RAW_STRING')
+    match("rf'a={d[\"a\"]}'", 'INTERPOLATED_RAW_STRING')
+    match("RF'{(lambda x: x*2)(3)}'", 'INTERPOLATED_RAW_STRING')
+    match("RF'{(lambda x: x*2)(3)}'", 'INTERPOLATED_RAW_STRING')
+
 def test_raw_string():
     match('r"pouet pouet"', 'RAW_STRING')