Scope string literal escape sequences similarly to Atom

1st1 · 1st1 · commit 5eaa12f00119 · 2015-10-24T02:49:07.000-04:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -774,7 +774,7 @@ repository:
   "escape-sequence-unicode":
     patterns: [
       {
-        name: "constant.character.python"
+        name: "constant.character.escape.python"
         match: '''
           (?x)
             \\\\ (
@@ -787,7 +787,7 @@ repository:
       }
     ]
   "escape-sequence":
-    name: "constant.character.python"
+    name: "constant.character.escape.python"
     match: '''
       (?x)
         \\\\ (
diff --git a/grammars/MagicPython.syntax.yaml b/grammars/MagicPython.syntax.yaml
@@ -544,7 +544,7 @@ repository:
 
   escape-sequence-unicode:
     patterns:
-      - name: constant.character.python
+      - name: constant.character.escape.python
         match: |
           (?x)
             \\ (
@@ -555,7 +555,7 @@ repository:
 
 
   escape-sequence:
-    name: constant.character.python
+    name: constant.character.escape.python
     match: |
       (?x)
         \\ (
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -1269,7 +1269,7 @@
         <array>
           <dict>
             <key>name</key>
-            <string>constant.character.python</string>
+            <string>constant.character.escape.python</string>
             <key>match</key>
             <string>(?x)
   \\ (
@@ -1284,7 +1284,7 @@
       <key>escape-sequence</key>
       <dict>
         <key>name</key>
-        <string>constant.character.python</string>
+        <string>constant.character.escape.python</string>
         <key>match</key>
         <string>(?x)
   \\ (
diff --git a/misc/scopes b/misc/scopes
@@ -5,9 +5,9 @@ comment.typehint.ignore.notation.python
 comment.typehint.puctuation.notation.python
 comment.typehint.type.notation.python
 comment.typehint.variable.notation.python
+constant.character.escape.python
 constant.character.escape.regexp
 constant.character.format.placeholder.other.python
-constant.character.python
 constant.character.set.regexp
 constant.character.unicode.regexp
 constant.language.python
diff --git a/test/docstrings/def1.py b/test/docstrings/def1.py
@@ -30,7 +30,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 '''           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.multi.python
 TE            : source.python, string.quoted.docstring.multi.python
-\'            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\'            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
 ''ST          : source.python, string.quoted.docstring.multi.python
 '''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
               : source.python
diff --git a/test/docstrings/def2.py b/test/docstrings/def2.py
@@ -30,7 +30,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 """           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.multi.python
 TE            : source.python, string.quoted.docstring.multi.python
-\"            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\"            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
 ""ST          : source.python, string.quoted.docstring.multi.python
 """           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
               : source.python
diff --git a/test/docstrings/def3.py b/test/docstrings/def3.py
@@ -30,7 +30,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
 TE            : source.python, string.quoted.docstring.single.python
-\'            : constant.character.python, source.python, string.quoted.docstring.single.python
+\'            : constant.character.escape.python, source.python, string.quoted.docstring.single.python
 ST            : source.python, string.quoted.docstring.single.python
 '             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
diff --git a/test/docstrings/def4.py b/test/docstrings/def4.py
@@ -30,7 +30,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
 TE            : source.python, string.quoted.docstring.single.python
-\"            : constant.character.python, source.python, string.quoted.docstring.single.python
+\"            : constant.character.escape.python, source.python, string.quoted.docstring.single.python
 ST            : source.python, string.quoted.docstring.single.python
 "             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
               : source.python
diff --git a/test/docstrings/escaping1.py b/test/docstrings/escaping1.py
@@ -14,46 +14,46 @@
 Module docstring : source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
     {{ %d simple  : source.python, string.quoted.docstring.multi.python
-\\            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\\            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
  string       : source.python, string.quoted.docstring.multi.python
 \             : constant.language.python, source.python, string.quoted.docstring.multi.python
     foo       : source.python, string.quoted.docstring.multi.python
-\'            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\'            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\"            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\"            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\a            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\a            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\b            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\b            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
  \c           : source.python, string.quoted.docstring.multi.python
-\f            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\f            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\n            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\n            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\r            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\r            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\t            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\t            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\v            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\v            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\5            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\5            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\55           : constant.character.python, source.python, string.quoted.docstring.multi.python
+\55           : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\555          : constant.character.python, source.python, string.quoted.docstring.multi.python
+\555          : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\05           : constant.character.python, source.python, string.quoted.docstring.multi.python
+\05           : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\005          : constant.character.python, source.python, string.quoted.docstring.multi.python
+\005          : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
     multiline "unicode" string  : source.python, string.quoted.docstring.multi.python
 \             : constant.language.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\xf1          : constant.character.python, source.python, string.quoted.docstring.multi.python
+\xf1          : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\u1234        : constant.character.python, source.python, string.quoted.docstring.multi.python
+\u1234        : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
 aaaa          : source.python, string.quoted.docstring.multi.python
-\U1234aaaa    : constant.character.python, source.python, string.quoted.docstring.multi.python
+\U1234aaaa    : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
               : source.python, string.quoted.docstring.multi.python
-\N{BLACK SPADE SUIT} : constant.character.python, source.python, string.quoted.docstring.multi.python
+\N{BLACK SPADE SUIT} : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
 '''           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
diff --git a/test/docstrings/module3.py b/test/docstrings/module3.py
@@ -11,7 +11,7 @@
 
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
 TE            : source.python, string.quoted.docstring.single.python
-\'            : constant.character.python, source.python, string.quoted.docstring.single.python
+\'            : constant.character.escape.python, source.python, string.quoted.docstring.single.python
 ST            : source.python, string.quoted.docstring.single.python
 '             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
 r             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
diff --git a/test/docstrings/module4.py b/test/docstrings/module4.py
@@ -11,7 +11,7 @@
 
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
 TE            : source.python, string.quoted.docstring.single.python
-\"            : constant.character.python, source.python, string.quoted.docstring.single.python
+\"            : constant.character.escape.python, source.python, string.quoted.docstring.single.python
 ST            : source.python, string.quoted.docstring.single.python
 "             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
 r             : source.python, storage.type.string.python, string.quoted.docstring.raw.single.python
diff --git a/test/docstrings/oneline1.py b/test/docstrings/oneline1.py
@@ -22,7 +22,7 @@
 """           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
 await         : keyword.control.flow.python, source.python
 """           : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.multi.python
-\n            : constant.character.python, source.python, string.quoted.docstring.multi.python
+\n            : constant.character.escape.python, source.python, string.quoted.docstring.multi.python
 >>> print('''docstring''') : source.python, string.quoted.docstring.multi.python
 """           : punctuation.definition.string.end.python, source.python, string.quoted.docstring.multi.python
 await         : keyword.control.flow.python, source.python
diff --git a/test/strings/bad1.py b/test/strings/bad1.py
@@ -9,7 +9,7 @@ def foo(a=1): pass
               : source.python
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 bad           : source.python, string.quoted.single.python
-\\            : constant.character.python, source.python, string.quoted.single.python
+\\            : constant.character.escape.python, source.python, string.quoted.single.python
  string       : source.python, string.quoted.single.python
               : invalid.illegal.newline.python, source.python, string.quoted.single.python
 foo           : source.python
diff --git a/test/strings/bad2.py b/test/strings/bad2.py
@@ -12,7 +12,7 @@ def foo(a=1): pass
 b             : source.python, storage.type.string.python, string.quoted.binary.single.python
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.binary.single.python
 bad           : source.python, string.quoted.binary.single.python
-\\            : constant.character.python, source.python, string.quoted.binary.single.python
+\\            : constant.character.escape.python, source.python, string.quoted.binary.single.python
  string       : source.python, string.quoted.binary.single.python
               : invalid.illegal.newline.python, source.python, string.quoted.binary.single.python
 foo           : source.python
diff --git a/test/strings/bytes1.py b/test/strings/bytes1.py
@@ -17,7 +17,7 @@
 \             : constant.language.python, source.python, string.quoted.binary.multi.python
               : source.python, string.quoted.binary.multi.python
               : source.python, string.quoted.binary.multi.python
-\xf1          : constant.character.python, source.python, string.quoted.binary.multi.python
+\xf1          : constant.character.escape.python, source.python, string.quoted.binary.multi.python
  \u1234aaaa \U1234aaaa : source.python, string.quoted.binary.multi.python
               : source.python, string.quoted.binary.multi.python
     \N{BLACK SPADE SUIT} : source.python, string.quoted.binary.multi.python
diff --git a/test/strings/bytes2.py b/test/strings/bytes2.py
@@ -21,7 +21,7 @@
 \             : constant.language.python, source.python, string.quoted.binary.multi.python
               : source.python, string.quoted.binary.multi.python
               : source.python, string.quoted.binary.multi.python
-\xf1          : constant.character.python, source.python, string.quoted.binary.multi.python
+\xf1          : constant.character.escape.python, source.python, string.quoted.binary.multi.python
  \u1234aaaa \U1234aaaa : source.python, string.quoted.binary.multi.python
               : source.python, string.quoted.binary.multi.python
     \N{BLACK SPADE SUIT} : source.python, string.quoted.binary.multi.python
diff --git a/test/strings/escaping1.py b/test/strings/escaping1.py
@@ -8,35 +8,35 @@
               : source.python
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 simple        : source.python, string.quoted.single.python
-\\            : constant.character.python, source.python, string.quoted.single.python
+\\            : constant.character.escape.python, source.python, string.quoted.single.python
  string       : source.python, string.quoted.single.python
 \             : constant.language.python, source.python, string.quoted.single.python
 foo           : source.python, string.quoted.single.python
-\'            : constant.character.python, source.python, string.quoted.single.python
+\'            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\"            : constant.character.python, source.python, string.quoted.single.python
+\"            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\a            : constant.character.python, source.python, string.quoted.single.python
+\a            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\b            : constant.character.python, source.python, string.quoted.single.python
+\b            : constant.character.escape.python, source.python, string.quoted.single.python
  \c           : source.python, string.quoted.single.python
-\f            : constant.character.python, source.python, string.quoted.single.python
+\f            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\n            : constant.character.python, source.python, string.quoted.single.python
+\n            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\r            : constant.character.python, source.python, string.quoted.single.python
+\r            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\t            : constant.character.python, source.python, string.quoted.single.python
+\t            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\v            : constant.character.python, source.python, string.quoted.single.python
+\v            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\5            : constant.character.python, source.python, string.quoted.single.python
+\5            : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\55           : constant.character.python, source.python, string.quoted.single.python
+\55           : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\555          : constant.character.python, source.python, string.quoted.single.python
+\555          : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\05           : constant.character.python, source.python, string.quoted.single.python
+\05           : constant.character.escape.python, source.python, string.quoted.single.python
               : source.python, string.quoted.single.python
-\005          : constant.character.python, source.python, string.quoted.single.python
+\005          : constant.character.escape.python, source.python, string.quoted.single.python
 "             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
diff --git a/test/strings/escaping2.py b/test/strings/escaping2.py
@@ -29,7 +29,7 @@
 ,             : source.python
               : source.python
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
-\\            : constant.character.python, source.python, string.quoted.single.python
+\\            : constant.character.escape.python, source.python, string.quoted.single.python
 '             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
 :             : source.python
 R             : source.python, storage.type.string.python, string.quoted.raw.single.python
diff --git a/test/strings/unicode1.py b/test/strings/unicode1.py
diff --git a/test/unicode/unicode1.py b/test/unicode/unicode1.py

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ repository:`
`774`	`774`	`"escape-sequence-unicode":`
`775`	`775`	`patterns: [`
`776`	`776`	`{`
`777`		`- name: "constant.character.python"`
	`777`	`+ name: "constant.character.escape.python"`
`778`	`778`	`match: '''`
`779`	`779`	`(?x)`
`780`	`780`	`\\\\ (`
`@@ -787,7 +787,7 @@ repository:`
`787`	`787`	`}`
`788`	`788`	`]`
`789`	`789`	`"escape-sequence":`
`790`		`- name: "constant.character.python"`
	`790`	`+ name: "constant.character.escape.python"`
`791`	`791`	`match: '''`
`792`	`792`	`(?x)`
`793`	`793`	`\\\\ (`