Make scopes for single-line rx more consistent with regular strings

Author: 1st1

grammars/MagicPython.cson

@@ -596,7 +596,7 @@ repository:
       }
     ]
   "regexp-single-quoted-single-line":
-    name: "string.regexp.quoted.python"
+    name: "string.regexp.quoted.single.python"
     begin: "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')"
     end: "(\\')|(?<!\\\\)(\\n)"
     beginCaptures:
@@ -619,7 +619,7 @@ repository:
       }
     ]
   "regexp-double-quoted-single-line":
-    name: "string.regexp.quoted.python"
+    name: "string.regexp.quoted.single.python"
     begin: "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\\")"
     end: "(\\\")|(?<!\\\\)(\\n)"
     beginCaptures:

grammars/MagicPython.syntax.yaml

@@ -438,7 +438,7 @@ repository:
       - include: '#regexp-double-quoted-single-line'
 
   regexp-single-quoted-single-line:
-    name: string.regexp.quoted.python
+    name: string.regexp.quoted.single.python
     begin: \b(([uU]r)|([bB]r)|(r[bB]?))(\')
     end: (\')|(?<!\\)(\n)
     beginCaptures:
@@ -453,7 +453,7 @@ repository:
       - include: '#single-one-regexp-expression'
 
   regexp-double-quoted-single-line:
-    name: string.regexp.quoted.python
+    name: string.regexp.quoted.single.python
     begin: \b(([uU]r)|([bB]r)|(r[bB]?))(\")
     end: (\")|(?<!\\)(\n)
     beginCaptures:

grammars/MagicPython.tmLanguage

@@ -927,7 +927,7 @@
       <key>regexp-single-quoted-single-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.python</string>
+        <string>string.regexp.quoted.single.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([bB]r)|(r[bB]?))(\&apos;)</string>
         <key>end</key>
@@ -979,7 +979,7 @@
       <key>regexp-double-quoted-single-line</key>
       <dict>
         <key>name</key>
-        <string>string.regexp.quoted.python</string>
+        <string>string.regexp.quoted.single.python</string>
         <key>begin</key>
         <string>\b(([uU]r)|([bB]r)|(r[bB]?))(\&quot;)</string>
         <key>end</key>

misc/scopes

@@ -131,7 +131,7 @@ string.quoted.raw.multi.python
 string.quoted.raw.single.python
 string.quoted.single.python
 string.regexp.quoted.multi.python
-string.regexp.quoted.python
+string.regexp.quoted.single.python
 support.function.builtin.python
 support.function.magic.python
 support.other.escape.special.regexp

test/docstrings/continuation3.py

@@ -15,19 +15,19 @@
               : source.python
 \             : separator.continuation.line.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.regexp.quoted.python
-'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
->>> print     : source.python, string.regexp.quoted.python
-(             : punctuation.parenthesis.begin.regexp, source.python, string.regexp.quoted.python, support.other.parenthesis.regexp
-42            : source.python, string.regexp.quoted.python
-)             : punctuation.parenthesis.end.regexp, source.python, string.regexp.quoted.python, support.other.parenthesis.regexp
-a             : source.python, string.regexp.quoted.python
-[             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.python
-w             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
-e             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
-r             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
-]             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.single.python
+>>> print     : source.python, string.regexp.quoted.single.python
+(             : punctuation.parenthesis.begin.regexp, source.python, string.regexp.quoted.single.python, support.other.parenthesis.regexp
+42            : source.python, string.regexp.quoted.single.python
+)             : punctuation.parenthesis.end.regexp, source.python, string.regexp.quoted.single.python, support.other.parenthesis.regexp
+a             : source.python, string.regexp.quoted.single.python
+[             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.single.python
+w             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
+e             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
+r             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
+]             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
               : source.python
 b             : source.python
 =             : keyword.operator.assignment.python, source.python

test/regexp/python1.py

@@ -6,14 +6,14 @@
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.regexp.quoted.python
-'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
-[             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.python
-a             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
--             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
-z             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
-]             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.single.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.single.python
+[             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.begin.regexp, source.python, string.regexp.quoted.single.python
+a             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
+-             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
+z             : constant.character.set.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
+]             : constant.other.set.regexp, meta.character.set.regexp, punctuation.character.set.end.regexp, source.python, string.regexp.quoted.single.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python