Make raw f-strings consistent.

Any f-string allows variable interpolation, that includes a raw
f-string. Make all raw prefixes (`r` or `R`) behave the same way in
combination with `f` prefix.

Fixes #186

grammars/src/MagicPython.syntax.yaml

@@ -103,82 +103,6 @@ repository:
         bquote: '(""")'
         equote: '(""")'
 
-    - file: 'regexp.inc.syntax.yaml'
-      vars:
-        prefix: 'single-one-'
-        basename: 'fregexp'
-        marker: "|(?=\\')"
-        nested: ''
-        guard: "|((?=(?<!\\\\)\\n))"
-
-    - file: 'regexp.inc.syntax.yaml'
-      vars:
-        prefix: 'single-three-'
-        basename: 'fregexp'
-        marker: "|(?=\\'\\'\\')"
-        nested: "- include: '#comments-string-single-three'"
-        guard: ""
-
-    - file: 'regexp.inc.syntax.yaml'
-      vars:
-        prefix: 'double-one-'
-        basename: 'fregexp'
-        marker: '|(?=")'
-        nested: ''
-        guard: "|((?=(?<!\\\\)\\n))"
-
-    - file: 'regexp.inc.syntax.yaml'
-      vars:
-        prefix: 'double-three-'
-        basename: 'fregexp'
-        marker: '|(?=""")'
-        nested: "- include: '#comments-string-double-three'"
-        guard: ""
-
-    - file: 'regexp.wrapper.syntax.yaml'
-      vars:
-        scopename: string.regexp.quoted.single.python
-                   string.interpolated.python
-        prefix: 'single-one-'
-        basename: 'fregexp'
-        nested: ''
-        modifier: '[fF]'
-        bquote: "(\\')"
-        equote: "(\\')|(?<!\\\\)(\\n)"
-
-    - file: 'regexp.wrapper.syntax.yaml'
-      vars:
-        scopename: string.regexp.quoted.multi.python
-                   string.interpolated.python
-        prefix: 'single-three-'
-        basename: 'fregexp'
-        nested: "- include: '#comments-string-single-three'"
-        modifier: '[fF]'
-        bquote: "(\\'\\'\\')"
-        equote: "(\\'\\'\\')"
-
-    - file: 'regexp.wrapper.syntax.yaml'
-      vars:
-        scopename: string.regexp.quoted.single.python
-                   string.interpolated.python
-        prefix: 'double-one-'
-        basename: 'fregexp'
-        nested: ''
-        modifier: '[fF]'
-        bquote: '(")'
-        equote: '(")|(?<!\\)(\n)'
-
-    - file: 'regexp.wrapper.syntax.yaml'
-      vars:
-        scopename: string.regexp.quoted.multi.python
-                   string.interpolated.python
-        prefix: 'double-three-'
-        basename: 'fregexp'
-        nested: "- include: '#comments-string-double-three'"
-        modifier: '[fF]'
-        bquote: '(""")'
-        equote: '(""")'
-
     - file: 'pystring.inc.syntax.yaml'
       vars:
         line: single
@@ -700,10 +624,6 @@ repository:
       - include: '#regexp-double-three-line'
       - include: '#regexp-single-one-line'
       - include: '#regexp-double-one-line'
-      - include: '#fregexp-single-three-line'
-      - include: '#fregexp-double-three-line'
-      - include: '#fregexp-single-one-line'
-      - include: '#fregexp-double-one-line'
 
   string:
     patterns:

grammars/src/pyfstring.inc.syntax.yaml

@@ -51,7 +51,7 @@ fstring-normf-quoted-${line}-line:
 
 fstring-raw-quoted-${line}-line:
   name: meta.fstring.python
-  begin: (\b(?:[R][fF]|[fF][R]))(${marker})
+  begin: (\b(?:[rR][fF]|[fF][rR]))(${marker})
   end: (\2)${guard}
   beginCaptures:
     '1': {name: storage.type.string.python

misc/example.py

@@ -22,6 +22,8 @@ async def coroutine(db:aio_db.DatabaseConnection) -> List[str]:
         async with db.transaction():
             result = await db.query(...)
             print(f'Result: {result!r} {a=} {b=!r}')
+            print(Rf'data: {c=}')
+            print(rf'data: {c=}')
 
     mapping = None     # type: Dict[int, Any] # PEP 484
 

test/fstrings/empty2.py

@@ -7,20 +7,22 @@
 
 
 
-rf            : source.python, storage.type.string.python, string.interpolated.python, string.regexp.quoted.single.python
-"             : punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-{             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-}             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-              : source.python, string.interpolated.python, string.regexp.quoted.single.python
-{             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-              : invalid.illegal.brace.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-}             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-"             : punctuation.definition.string.end.python, source.python, string.interpolated.python, string.regexp.quoted.single.python
-rf            : source.python, storage.type.string.python, string.interpolated.python, string.regexp.quoted.multi.python
-"""           : punctuation.definition.string.begin.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
-{             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
-}             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
-{             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
-              : invalid.illegal.brace.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
-}             : constant.character.format.placeholder.other.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
-"""           : punctuation.definition.string.end.python, source.python, string.interpolated.python, string.regexp.quoted.multi.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+"             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+              : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+              : invalid.illegal.brace.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+"             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.multi.python
+"""           : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.multi.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+              : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+              : invalid.illegal.brace.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+              : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+"""           : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.multi.python

test/fstrings/fraw1.py

@@ -0,0 +1,40 @@
+a = fr'[a-z]'
+a = Fr'[a-z]'
+a = rf'[a-z]'
+a = rF'[a-z]'
+
+
+
+
+a             : source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+fr            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+[a-z]         : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+a             : source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+Fr            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+[a-z]         : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+a             : source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+[a-z]         : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+a             : source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+rF            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+[a-z]         : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python

test/fstrings/fraw2.py

@@ -0,0 +1,36 @@
+rf'fo{{2}}'
+rf"fo{{2}}"
+rf'''fo{{2}}'''
+rf"""fo{{2}}"""
+
+
+
+
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+{{            : constant.character.escape.python, meta.fstring.python, source.python
+2             : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+}}            : constant.character.escape.python, meta.fstring.python, source.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+"             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+{{            : constant.character.escape.python, meta.fstring.python, source.python
+2             : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+}}            : constant.character.escape.python, meta.fstring.python, source.python
+"             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.multi.python
+'''           : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.multi.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+{{            : constant.character.escape.python, meta.fstring.python, source.python
+2             : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+}}            : constant.character.escape.python, meta.fstring.python, source.python
+'''           : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.multi.python
+"""           : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.multi.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+{{            : constant.character.escape.python, meta.fstring.python, source.python
+2             : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+}}            : constant.character.escape.python, meta.fstring.python, source.python
+"""           : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.multi.python

test/fstrings/fraw3.py

@@ -0,0 +1,36 @@
+rf'fo{2}'
+rf"fo{2}"
+rf'''fo{2}'''
+rf"""fo{2}"""
+
+
+
+
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+'             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+2             : constant.numeric.dec.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+'             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.single.python
+"             : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.single.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+2             : constant.numeric.dec.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+"             : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.single.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.multi.python
+'''           : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.multi.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+2             : constant.numeric.dec.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+'''           : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+rf            : meta.fstring.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.raw.multi.python
+"""           : meta.fstring.python, punctuation.definition.string.begin.python, source.python, string.quoted.raw.multi.python
+fo            : meta.fstring.python, source.python, string.interpolated.python, string.quoted.raw.multi.python
+{             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+2             : constant.numeric.dec.python, meta.fstring.python, source.python
+}             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
+"""           : meta.fstring.python, punctuation.definition.string.end.python, source.python, string.interpolated.python, string.quoted.raw.multi.python