Give kwargs in class declarations a special scope.

Author: vpetrovykh

grammars/MagicPython.cson

@@ -1105,14 +1105,28 @@ repository:
       }
     ]
   "inheritance-identifier":
-    match: '''
-      (?x)
-        \\b ([[:alpha:]_]\\w*) \\b
-      
-    '''
-    captures:
-      "1":
-        name: "entity.other.inherited-class.python"
+    patterns: [
+      {
+        match: '''
+          (?x)
+            \\b ([[:alpha:]_]\\w*) \\b (?=\\s*=)
+          
+        '''
+        captures:
+          "1":
+            name: "entity.other.inherited-class.python variable.parameter.class.python"
+      }
+      {
+        match: '''
+          (?x)
+            \\b ([[:alpha:]_]\\w*) \\b
+          
+        '''
+        captures:
+          "1":
+            name: "entity.other.inherited-class.python"
+      }
+    ]
   "expression-class":
     patterns: [
       {

grammars/MagicPython.tmLanguage

@@ -1708,18 +1708,37 @@
       </dict>
       <key>inheritance-identifier</key>
       <dict>
-        <key>match</key>
-        <string>(?x)
-  \b ([[:alpha:]_]\w*) \b
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>match</key>
+            <string>(?x)
+  \b ([[:alpha:]_]\w*) \b (?=\s*=)
 </string>
-        <key>captures</key>
-        <dict>
-          <key>1</key>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>entity.other.inherited-class.python variable.parameter.class.python</string>
+              </dict>
+            </dict>
+          </dict>
           <dict>
-            <key>name</key>
-            <string>entity.other.inherited-class.python</string>
+            <key>match</key>
+            <string>(?x)
+  \b ([[:alpha:]_]\w*) \b
+</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>entity.other.inherited-class.python</string>
+              </dict>
+            </dict>
           </dict>
-        </dict>
+        </array>
       </dict>
       <key>expression-class</key>
       <dict>

grammars/src/MagicPython.syntax.yaml

@@ -887,11 +887,18 @@ repository:
       - include: '#inheritance-identifier'
 
   inheritance-identifier:
-    match: |
-      (?x)
-        \b ([[:alpha:]_]\w*) \b
-    captures:
-      '1': {name: entity.other.inherited-class.python}
+    patterns:
+      - match: |
+          (?x)
+            \b ([[:alpha:]_]\w*) \b (?=\s*=)
+        captures:
+          '1': {name: entity.other.inherited-class.python
+                      variable.parameter.class.python}
+      - match: |
+          (?x)
+            \b ([[:alpha:]_]\w*) \b
+        captures:
+          '1': {name: entity.other.inherited-class.python}
 
   expression-class:
     patterns:

misc/scopes

@@ -161,6 +161,7 @@ support.variable.magic.python
 variable.language.special.cls.python
 variable.language.special.self.python
 variable.legacy.builtin.python
+variable.parameter.class.python
 variable.parameter.function-call.python
 variable.parameter.function.language.python
 variable.parameter.function.language.special.cls.python

test/classes/class14.py

@@ -25,7 +25,7 @@ class         : meta.class.python, source.python, storage.type.class.python
 a             : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 ,             : meta.class.inheritance.python, meta.class.python, punctuation.separator.inheritance.python, source.python
               : meta.class.inheritance.python, meta.class.python, source.python
-b             : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
+b             : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python, variable.parameter.class.python
 =             : keyword.operator.assignment.python, meta.class.inheritance.python, meta.class.python, source.python
 Exception     : meta.class.inheritance.python, meta.class.python, source.python, support.type.exception.python
 )             : meta.class.inheritance.python, meta.class.python, punctuation.definition.inheritance.end.python, source.python

test/classes/class2.py

@@ -1,11 +1,14 @@
 @dec
+# Bar.name=... is not legal, but the test is for highlighter not breaking badly
 class Spam(Foo.Bar, Bar.name={'very': 'odd'}):
     pass
 
 
 
 @             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
 dec           : entity.name.function.decorator.python, meta.function.decorator.python, source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ Bar.name=... is not legal, but the test is for highlighter not breaking badly : comment.line.number-sign.python, source.python
 class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.python, source.python
 Spam          : entity.name.type.class.python, meta.class.python, source.python
@@ -17,7 +20,7 @@ class         : meta.class.python, source.python, storage.type.class.python
               : meta.class.inheritance.python, meta.class.python, source.python
 Bar           : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 .             : meta.class.inheritance.python, meta.class.python, source.python
-name          : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
+name          : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python, variable.parameter.class.python
 =             : keyword.operator.assignment.python, meta.class.inheritance.python, meta.class.python, source.python
 {             : meta.class.inheritance.python, meta.class.python, punctuation.definition.dict.begin.python, source.python
 '             : meta.class.inheritance.python, meta.class.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python