Highlight 'self' and 'cls' as special in item-access (ex: self[1])

Author: Yury Selivanov

grammars/MagicPython.cson

@@ -1192,6 +1192,9 @@ repository:
     ]
   "item-name":
     patterns: [
+      {
+        include: "#special-variables"
+      }
       {
         include: "#special-names"
       }

grammars/MagicPython.syntax.yaml

@@ -806,6 +806,7 @@ repository:
 
   item-name:
     patterns:
+      - include: '#special-variables'
       - include: '#special-names'
       - match: |
           (?x)

grammars/MagicPython.tmLanguage

@@ -1946,6 +1946,10 @@ it's not tokenized as ellipsis.
       <dict>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#special-variables</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#special-names</string>

test/classes/class11.py

@@ -6,6 +6,7 @@ def __init__(self, a, b=1):
         self()
         a.self = 1
         a.self.bar = 2
+        self[123]
 
 
 
@@ -66,3 +67,8 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 =             : keyword.operator.assignment.python, source.python
               : source.python
 2             : constant.numeric.dec.python, source.python
+              : source.python
+self          : meta.item-access.python, source.python, variable.language.special.self.python
+[             : meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+123           : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
+]             : meta.item-access.python, punctuation.definition.arguments.end.python, source.python

test/classes/class12.py

@@ -8,6 +8,7 @@ def meth(cls, a, b=1):
         cls + 1
         a.cls = 1
         a.cls.__name__
+        cls[123]
 
 
 
@@ -73,3 +74,8 @@ def           : meta.function.python, source.python, storage.type.function.pytho
         a.cls : source.python
 .             : source.python
 __name__      : source.python, support.variable.magic.python
+              : source.python
+cls           : meta.item-access.python, source.python, variable.language.special.cls.python
+[             : meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+123           : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
+]             : meta.item-access.python, punctuation.definition.arguments.end.python, source.python