Simplify regex scopes (drop single/double quote info)

Author: 1st1

grammars/MagicPython.YAML-tmLanguage

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

grammars/MagicPython.cson

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

grammars/MagicPython.tmLanguage

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

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.single.python
-'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.single.python
-[             : constant.other.set.regexp punctuation.character.set.begin.regexp, meta.character.set.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 punctuation.character.set.end.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.single.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.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 punctuation.character.set.begin.regexp, meta.character.set.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 punctuation.character.set.end.regexp, meta.character.set.regexp, source.python, string.regexp.quoted.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python

test/regexp/python2.py

@@ -8,9 +8,9 @@
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.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
-              : invalid.illegal.newline.python, source.python, string.regexp.quoted.single.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+              : invalid.illegal.newline.python, source.python, string.regexp.quoted.python
               : source.python
 (             : punctuation.parenthesis.begin.python, source.python
 ?             : invalid.illegal.character.python, source.python

test/regexp/python5.py

@@ -13,10 +13,10 @@
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.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
-foo#not a comment : source.python, string.regexp.quoted.single.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+foo#not a comment : source.python, string.regexp.quoted.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python

test/regexp/python6.py

@@ -13,10 +13,10 @@
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.regexp.quoted.double.python
-"             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.double.python
-foo#not a comment : source.python, string.regexp.quoted.double.python
-"             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.double.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+"             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+foo#not a comment : source.python, string.regexp.quoted.python
+"             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python

test/regexp/python7.py

@@ -17,20 +17,20 @@
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.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
-(             : punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp, source.python, string.regexp.quoted.single.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+(             : punctuation.parenthesis.begin.regexp support.other.parenthesis.regexp, source.python, string.regexp.quoted.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.regexp.quoted.double.python
-"             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.double.python
-(             : keyword.operator.lookahead.regexp, punctuation.parenthesis.lookahead.begin.regexp, source.python, string.regexp.quoted.double.python
-?=            : keyword.operator.lookahead.regexp, source.python, string.regexp.quoted.double.python
-"             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.double.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+"             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+(             : keyword.operator.lookahead.regexp, punctuation.parenthesis.lookahead.begin.regexp, source.python, string.regexp.quoted.python
+?=            : keyword.operator.lookahead.regexp, source.python, string.regexp.quoted.python
+"             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python

test/regexp/python9.py

@@ -5,16 +5,16 @@
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.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
-foo           : source.python, string.regexp.quoted.single.python
-[^]           : source.python, string.regexp.quoted.single.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+foo           : source.python, string.regexp.quoted.python
+[^]           : source.python, string.regexp.quoted.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.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
-foo           : source.python, string.regexp.quoted.single.python
-[]            : source.python, string.regexp.quoted.single.python
-'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.single.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+'             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+foo           : source.python, string.regexp.quoted.python
+[]            : source.python, string.regexp.quoted.python
+'             : punctuation.definition.string.end.python, source.python, string.regexp.quoted.python

test/strings/bad3.py

@@ -8,10 +8,10 @@ def foo(a=1): pass # doesn't break!
 a             : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
-r             : source.python, storage.type.string.python, string.regexp.quoted.double.python
-"             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.double.python
-bad string    : source.python, string.regexp.quoted.double.python
-              : invalid.illegal.newline.python, source.python, string.regexp.quoted.double.python
+r             : source.python, storage.type.string.python, string.regexp.quoted.python
+"             : punctuation.definition.string.begin.python, source.python, string.regexp.quoted.python
+bad string    : source.python, string.regexp.quoted.python
+              : invalid.illegal.newline.python, source.python, string.regexp.quoted.python
 foo           : source.python
 \             : separator.continuation.line.python, source.python
 ' \" \a \b \c \f \n \r \t \v \5 \55 \555 \05 \005" : invalid.illegal.line.continuation.python, source.python