Add an extra scope for f-strings: string.interpolated.python

This way f-strings may be highlighted differently from regular
Python strings.

Author: 1st1

grammars/MagicPython.cson

@@ -3955,7 +3955,7 @@ repository:
       }
     ]
   "fregexp-single-one-line":
-    name: "string.regexp.quoted.single.python"
+    name: "string.regexp.quoted.single.python string.interpolated.python"
     begin: "\\b(([uU]r)|([fF]r)|(r[fF]?))(\\')"
     end: "(\\')|(?<!\\\\)(\\n)"
     beginCaptures:
@@ -3978,7 +3978,7 @@ repository:
       }
     ]
   "fregexp-single-three-line":
-    name: "string.regexp.quoted.multi.python"
+    name: "string.regexp.quoted.multi.python string.interpolated.python"
     begin: "\\b(([uU]r)|([fF]r)|(r[fF]?))(\\'\\'\\')"
     end: "(\\'\\'\\')"
     beginCaptures:
@@ -4001,7 +4001,7 @@ repository:
       }
     ]
   "fregexp-double-one-line":
-    name: "string.regexp.quoted.single.python"
+    name: "string.regexp.quoted.single.python string.interpolated.python"
     begin: "\\b(([uU]r)|([fF]r)|(r[fF]?))(\")"
     end: "(\")|(?<!\\\\)(\\n)"
     beginCaptures:
@@ -4024,7 +4024,7 @@ repository:
       }
     ]
   "fregexp-double-three-line":
-    name: "string.regexp.quoted.multi.python"
+    name: "string.regexp.quoted.multi.python string.interpolated.python"
     begin: "\\b(([uU]r)|([fF]r)|(r[fF]?))(\"\"\")"
     end: "(\"\"\")"
     beginCaptures:
@@ -4400,14 +4400,14 @@ repository:
     end: "(\\3)|((?<!\\\\)\\n)"
     beginCaptures:
       "1":
-        name: "string.quoted.single.python storage.type.string.python"
+        name: "string.quoted.single.python string.interpolated.python storage.type.string.python"
       "2":
         name: "invalid.illegal.prefix.python"
       "3":
-        name: "string.quoted.single.python punctuation.definition.string.begin.python"
+        name: "string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python"
     endCaptures:
       "1":
-        name: "string.quoted.single.python punctuation.definition.string.end.python"
+        name: "string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"
       "2":
         name: "invalid.illegal.newline.python"
     patterns: [
@@ -4432,12 +4432,12 @@ repository:
       "1":
         name: "invalid.illegal.prefix.python"
       "2":
-        name: "string.quoted.single.python storage.type.string.python"
+        name: "string.quoted.single.python string.interpolated.python storage.type.string.python"
       "3":
         name: "string.quoted.single.python punctuation.definition.string.begin.python"
     endCaptures:
       "1":
-        name: "string.quoted.single.python punctuation.definition.string.end.python"
+        name: "string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python"
       "2":
         name: "invalid.illegal.newline.python"
     patterns: [
@@ -4460,12 +4460,12 @@ repository:
     end: "(\\2)|((?<!\\\\)\\n)"
     beginCaptures:
       "1":
-        name: "string.quoted.raw.single.python storage.type.string.python"
+        name: "string.quoted.raw.single.python string.interpolated.python storage.type.string.python"
       "2":
         name: "string.quoted.raw.single.python punctuation.definition.string.begin.python"
     endCaptures:
       "1":
-        name: "string.quoted.raw.single.python punctuation.definition.string.end.python"
+        name: "string.quoted.raw.single.python string.interpolated.python punctuation.definition.string.end.python"
       "2":
         name: "invalid.illegal.newline.python"
     patterns: [
@@ -4483,7 +4483,7 @@ repository:
       }
     ]
   "fstring-single-core":
-    name: "string.quoted.single.python"
+    name: "string.quoted.single.python string.interpolated.python"
     match: '''
       (?x)
         (.+?)
@@ -4504,7 +4504,7 @@ repository:
       
     '''
   "fstring-raw-single-core":
-    name: "string.quoted.raw.single.python"
+    name: "string.quoted.raw.single.python string.interpolated.python"
     match: '''
       (?x)
         (.+?)
@@ -4624,14 +4624,14 @@ repository:
     end: "(\\3)"
     beginCaptures:
       "1":
-        name: "string.quoted.multi.python storage.type.string.python"
+        name: "string.quoted.multi.python string.interpolated.python storage.type.string.python"
       "2":
         name: "invalid.illegal.prefix.python"
       "3":
-        name: "string.quoted.multi.python punctuation.definition.string.begin.python"
+        name: "string.quoted.multi.python string.interpolated.python punctuation.definition.string.begin.python"
     endCaptures:
       "1":
-        name: "string.quoted.multi.python punctuation.definition.string.end.python"
+        name: "string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python"
       "2":
         name: "invalid.illegal.newline.python"
     patterns: [
@@ -4656,12 +4656,12 @@ repository:
       "1":
         name: "invalid.illegal.prefix.python"
       "2":
-        name: "string.quoted.multi.python storage.type.string.python"
+        name: "string.quoted.multi.python string.interpolated.python storage.type.string.python"
       "3":
         name: "string.quoted.multi.python punctuation.definition.string.begin.python"
     endCaptures:
       "1":
-        name: "string.quoted.multi.python punctuation.definition.string.end.python"
+        name: "string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python"
       "2":
         name: "invalid.illegal.newline.python"
     patterns: [
@@ -4684,12 +4684,12 @@ repository:
     end: "(\\2)"
     beginCaptures:
       "1":
-        name: "string.quoted.raw.multi.python storage.type.string.python"
+        name: "string.quoted.raw.multi.python string.interpolated.python storage.type.string.python"
       "2":
         name: "string.quoted.raw.multi.python punctuation.definition.string.begin.python"
     endCaptures:
       "1":
-        name: "string.quoted.raw.multi.python punctuation.definition.string.end.python"
+        name: "string.quoted.raw.multi.python string.interpolated.python punctuation.definition.string.end.python"
       "2":
         name: "invalid.illegal.newline.python"
     patterns: [
@@ -4707,7 +4707,7 @@ repository:
       }
     ]
   "fstring-multi-core":
-    name: "string.quoted.multi.python"
+    name: "string.quoted.multi.python string.interpolated.python"
     match: '''
       (?x)
         (.+?)
@@ -4728,7 +4728,7 @@ repository:
       
     '''
   "fstring-raw-multi-core":
-    name: "string.quoted.raw.multi.python"
+    name: "string.quoted.raw.multi.python string.interpolated.python"
     match: '''
       (?x)
         (.+?)

grammars/MagicPython.tmLanguage

@@ -6908,7 +6908,7 @@ indirectly through syntactic constructs
       <key>fregexp-single-one-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.single.python</string>
+        <string>string.regexp.quoted.single.python string.interpolated.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(\')</string>
         <key>end</key>
@@ -6960,7 +6960,7 @@ indirectly through syntactic constructs
       <key>fregexp-single-three-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.multi.python</string>
+        <string>string.regexp.quoted.multi.python string.interpolated.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(\'\'\')</string>
         <key>end</key>
@@ -7012,7 +7012,7 @@ indirectly through syntactic constructs
       <key>fregexp-double-one-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.single.python</string>
+        <string>string.regexp.quoted.single.python string.interpolated.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(")</string>
         <key>end</key>
@@ -7064,7 +7064,7 @@ indirectly through syntactic constructs
       <key>fregexp-double-three-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.multi.python</string>
+        <string>string.regexp.quoted.multi.python string.interpolated.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([fF]r)|(r[fF]?))(""")</string>
         <key>end</key>
@@ -7726,7 +7726,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python storage.type.string.python</string>
+            <string>string.quoted.single.python string.interpolated.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7736,15 +7736,15 @@ indirectly through syntactic constructs
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python punctuation.definition.string.begin.python</string>
+            <string>string.quoted.single.python string.interpolated.python punctuation.definition.string.begin.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python punctuation.definition.string.end.python</string>
+            <string>string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7790,7 +7790,7 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python storage.type.string.python</string>
+            <string>string.quoted.single.python string.interpolated.python storage.type.string.python</string>
           </dict>
           <key>3</key>
           <dict>
@@ -7803,7 +7803,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python punctuation.definition.string.end.python</string>
+            <string>string.quoted.single.python string.interpolated.python punctuation.definition.string.end.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7844,7 +7844,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.single.python storage.type.string.python</string>
+            <string>string.quoted.raw.single.python string.interpolated.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7857,7 +7857,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.single.python punctuation.definition.string.end.python</string>
+            <string>string.quoted.raw.single.python string.interpolated.python punctuation.definition.string.end.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7888,7 +7888,7 @@ indirectly through syntactic constructs
       <key>fstring-single-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.single.python</string>
+        <string>string.quoted.single.python string.interpolated.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
@@ -7911,7 +7911,7 @@ indirectly through syntactic constructs
       <key>fstring-raw-single-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.raw.single.python</string>
+        <string>string.quoted.raw.single.python string.interpolated.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
@@ -8098,7 +8098,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python storage.type.string.python</string>
+            <string>string.quoted.multi.python string.interpolated.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8108,15 +8108,15 @@ indirectly through syntactic constructs
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python punctuation.definition.string.begin.python</string>
+            <string>string.quoted.multi.python string.interpolated.python punctuation.definition.string.begin.python</string>
           </dict>
         </dict>
         <key>endCaptures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python punctuation.definition.string.end.python</string>
+            <string>string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8162,7 +8162,7 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python storage.type.string.python</string>
+            <string>string.quoted.multi.python string.interpolated.python storage.type.string.python</string>
           </dict>
           <key>3</key>
           <dict>
@@ -8175,7 +8175,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python punctuation.definition.string.end.python</string>
+            <string>string.quoted.multi.python string.interpolated.python punctuation.definition.string.end.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8216,7 +8216,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.multi.python storage.type.string.python</string>
+            <string>string.quoted.raw.multi.python string.interpolated.python storage.type.string.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8229,7 +8229,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.multi.python punctuation.definition.string.end.python</string>
+            <string>string.quoted.raw.multi.python string.interpolated.python punctuation.definition.string.end.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8260,7 +8260,7 @@ indirectly through syntactic constructs
       <key>fstring-multi-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.multi.python</string>
+        <string>string.quoted.multi.python string.interpolated.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)
@@ -8283,7 +8283,7 @@ indirectly through syntactic constructs
       <key>fstring-raw-multi-core</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.raw.multi.python</string>
+        <string>string.quoted.raw.multi.python string.interpolated.python</string>
         <key>match</key>
         <string>(?x)
   (.+?)

grammars/src/MagicPython.syntax.yaml

@@ -139,6 +139,7 @@ repository:
     - file: 'regexp.wrapper.syntax.yaml'
       vars:
         scopename: string.regexp.quoted.single.python
+                   string.interpolated.python
         prefix: 'single-one-'
         basename: 'fregexp'
         nested: ''
@@ -149,6 +150,7 @@ repository:
     - 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'"
@@ -159,6 +161,7 @@ repository:
     - file: 'regexp.wrapper.syntax.yaml'
       vars:
         scopename: string.regexp.quoted.single.python
+                   string.interpolated.python
         prefix: 'double-one-'
         basename: 'fregexp'
         nested: ''
@@ -169,6 +172,7 @@ repository:
     - 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'"