Reorder scopes for f-strings; fixes issue #75.

Author: 1st1

Diff for: grammars/MagicPython.cson

@@ -4448,7 +4448,7 @@ repository:
     end: "(\\3)|((?<!\\\\)\\n)"
     beginCaptures:
       "1":
-        name: "string.quoted.single.python string.interpolated.python storage.type.string.python"
+        name: "storage.type.string.python string.quoted.single.python string.interpolated.python"
       "2":
         name: "invalid.illegal.prefix.python"
       "3":
@@ -4480,7 +4480,7 @@ repository:
       "1":
         name: "invalid.illegal.prefix.python"
       "2":
-        name: "string.quoted.single.python string.interpolated.python storage.type.string.python"
+        name: "storage.type.string.python string.quoted.single.python string.interpolated.python"
       "3":
         name: "string.quoted.single.python punctuation.definition.string.begin.python"
     endCaptures:
@@ -4508,7 +4508,7 @@ repository:
     end: "(\\2)|((?<!\\\\)\\n)"
     beginCaptures:
       "1":
-        name: "string.quoted.raw.single.python string.interpolated.python storage.type.string.python"
+        name: "storage.type.string.python string.quoted.raw.single.python string.interpolated.python"
       "2":
         name: "string.quoted.raw.single.python punctuation.definition.string.begin.python"
     endCaptures:
@@ -4672,7 +4672,7 @@ repository:
     end: "(\\3)"
     beginCaptures:
       "1":
-        name: "string.quoted.multi.python string.interpolated.python storage.type.string.python"
+        name: "storage.type.string.python string.quoted.multi.python string.interpolated.python"
       "2":
         name: "invalid.illegal.prefix.python"
       "3":
@@ -4704,7 +4704,7 @@ repository:
       "1":
         name: "invalid.illegal.prefix.python"
       "2":
-        name: "string.quoted.multi.python string.interpolated.python storage.type.string.python"
+        name: "storage.type.string.python string.quoted.multi.python string.interpolated.python"
       "3":
         name: "string.quoted.multi.python punctuation.definition.string.begin.python"
     endCaptures:
@@ -4732,7 +4732,7 @@ repository:
     end: "(\\2)"
     beginCaptures:
       "1":
-        name: "string.quoted.raw.multi.python string.interpolated.python storage.type.string.python"
+        name: "storage.type.string.python string.quoted.raw.multi.python string.interpolated.python"
       "2":
         name: "string.quoted.raw.multi.python punctuation.definition.string.begin.python"
     endCaptures:

Diff for: grammars/MagicPython.tmLanguage

@@ -7805,7 +7805,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python string.interpolated.python storage.type.string.python</string>
+            <string>storage.type.string.python string.quoted.single.python string.interpolated.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -7869,7 +7869,7 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.single.python string.interpolated.python storage.type.string.python</string>
+            <string>storage.type.string.python string.quoted.single.python string.interpolated.python</string>
           </dict>
           <key>3</key>
           <dict>
@@ -7923,7 +7923,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.single.python string.interpolated.python storage.type.string.python</string>
+            <string>storage.type.string.python string.quoted.raw.single.python string.interpolated.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8177,7 +8177,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python string.interpolated.python storage.type.string.python</string>
+            <string>storage.type.string.python string.quoted.multi.python string.interpolated.python</string>
           </dict>
           <key>2</key>
           <dict>
@@ -8241,7 +8241,7 @@ indirectly through syntactic constructs
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.multi.python string.interpolated.python storage.type.string.python</string>
+            <string>storage.type.string.python string.quoted.multi.python string.interpolated.python</string>
           </dict>
           <key>3</key>
           <dict>
@@ -8295,7 +8295,7 @@ indirectly through syntactic constructs
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>string.quoted.raw.multi.python string.interpolated.python storage.type.string.python</string>
+            <string>storage.type.string.python string.quoted.raw.multi.python string.interpolated.python</string>
           </dict>
           <key>2</key>
           <dict>

Diff for: grammars/src/pyfstring.inc.syntax.yaml

@@ -5,9 +5,9 @@ repository:
     begin: (\b[fF])([bBuU])?(${marker})
     end: (\3)${guard}
     beginCaptures:
-      '1': {name: string.quoted.${line}.python
-                  string.interpolated.python
-                  storage.type.string.python}
+      '1': {name: storage.type.string.python
+                  string.quoted.${line}.python
+                  string.interpolated.python}
       '2': {name: invalid.illegal.prefix.python}
       '3': {name: string.quoted.${line}.python
                   string.interpolated.python
@@ -29,9 +29,9 @@ repository:
     end: (\3)${guard}
     beginCaptures:
       '1': {name: invalid.illegal.prefix.python}
-      '2': {name: string.quoted.${line}.python
-                  string.interpolated.python
-                  storage.type.string.python}
+      '2': {name: storage.type.string.python
+                  string.quoted.${line}.python
+                  string.interpolated.python}
       '3': {name: string.quoted.${line}.python
                   punctuation.definition.string.begin.python}
     endCaptures:
@@ -50,9 +50,9 @@ repository:
     begin: (\b(?:[R][fF]|[fF][R]))(${marker})
     end: (\2)${guard}
     beginCaptures:
-      '1': {name: string.quoted.raw.${line}.python
-                  string.interpolated.python
-                  storage.type.string.python}
+      '1': {name: storage.type.string.python
+                  string.quoted.raw.${line}.python
+                  string.interpolated.python}
       '2': {name: string.quoted.raw.${line}.python
                   punctuation.definition.string.begin.python}
     endCaptures: