Add some more specific scopes for member access.

Add `meta.attribute.python` to mark otherwise non-special attributes.
Add `meta.indexed-name.python` to mark the name of the object being
indexed.

In combination with `meta.member.access.python` the above scopes can
help highlight member access that is no otherwise using a builtin or
some other special case. For highlighting method names in method calls
the combination of `meta.member.access.python` and
`meta.function-call.generic.python` could be used.

Fixes #188.

Author: vpetrovykh

grammars/MagicPython.cson

@@ -431,6 +431,9 @@ repository:
       {
         include: "#member-access-base"
       }
+      {
+        include: "#member-access-attribute"
+      }
     ]
   "member-access-base":
     patterns: [
@@ -453,6 +456,14 @@ repository:
         include: "#item-access"
       }
     ]
+  "member-access-attribute":
+    comment: "Highlight attribute access in otherwise non-specialized cases."
+    name: "meta.attribute.python"
+    match: '''
+      (?x)
+        \\b ([[:alpha:]_]\\w*) \\b
+      
+    '''
   "special-names":
     name: "constant.other.caps.python"
     match: '''
@@ -1488,6 +1499,7 @@ repository:
         include: "#special-names"
       }
       {
+        name: "meta.indexed-name.python"
         match: '''
           (?x)
             \\b ([[:alpha:]_]\\w*) \\b

grammars/MagicPython.tmLanguage

@@ -647,6 +647,10 @@ it's probably control flow like:
             <key>include</key>
             <string>#member-access-base</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#member-access-attribute</string>
+          </dict>
         </array>
       </dict>
       <key>member-access-base</key>
@@ -679,6 +683,17 @@ it's probably control flow like:
           </dict>
         </array>
       </dict>
+      <key>member-access-attribute</key>
+      <dict>
+        <key>comment</key>
+        <string>Highlight attribute access in otherwise non-specialized cases.</string>
+        <key>name</key>
+        <string>meta.attribute.python</string>
+        <key>match</key>
+        <string>(?x)
+  \b ([[:alpha:]_]\w*) \b
+</string>
+      </dict>
       <key>special-names</key>
       <dict>
         <key>name</key>
@@ -2340,6 +2355,8 @@ it's probably control flow like:
             <string>#special-names</string>
           </dict>
           <dict>
+            <key>name</key>
+            <string>meta.indexed-name.python</string>
             <key>match</key>
             <string>(?x)
   \b ([[:alpha:]_]\w*) \b

grammars/src/MagicPython.syntax.yaml

@@ -449,6 +449,7 @@ repository:
     patterns:
       - include: '#function-call'
       - include: '#member-access-base'
+      - include: '#member-access-attribute'
 
   member-access-base:
     patterns:
@@ -459,6 +460,13 @@ repository:
       - include: '#line-continuation'
       - include: '#item-access'
 
+  member-access-attribute:
+    comment: Highlight attribute access in otherwise non-specialized cases.
+    name: meta.attribute.python
+    match: |
+      (?x)
+        \b ([[:alpha:]_]\w*) \b
+
   special-names:
     name: constant.other.caps.python
     match: |
@@ -1142,7 +1150,8 @@ repository:
       - include: '#special-variables'
       - include: '#builtin-functions'
       - include: '#special-names'
-      - match: |
+      - name: meta.indexed-name.python
+        match: |
           (?x)
             \b ([[:alpha:]_]\w*) \b
 

misc/scopes

@@ -60,6 +60,7 @@ keyword.operator.python
 keyword.operator.quantifier.regexp
 keyword.operator.unpacking.arguments.python
 keyword.operator.unpacking.parameter.python
+meta.attribute.python
 meta.backreference.named.regexp
 meta.backreference.regexp
 meta.character.set.regexp
@@ -73,6 +74,7 @@ meta.function-call.python
 meta.function.decorator.python
 meta.function.parameters.python
 meta.function.python
+meta.indexed-name.python
 meta.item-access.python
 meta.lambda-function.python
 meta.member.access.python

test/atom-spec/python-spec.js

@@ -71,7 +71,7 @@
 __builtins__  : source.python, support.variable.magic.python
 __builtins__  : source.python, support.variable.magic.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-len           : meta.member.access.python, source.python
+len           : meta.attribute.python, meta.member.access.python, source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 __builtins__  : meta.function-call.arguments.python, meta.function-call.python, source.python, support.variable.magic.python
@@ -183,4 +183,4 @@
 __traceback__ : meta.member.access.python, source.python, support.variable.magic.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-__notspecial__ : meta.member.access.python, source.python
+__notspecial__ : meta.attribute.python, meta.member.access.python, source.python

test/builtins/builtins3.py

@@ -10,19 +10,19 @@
 
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-int           : meta.member.access.python, source.python
+int           : meta.attribute.python, meta.member.access.python, source.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-sum           : meta.member.access.python, source.python
+sum           : meta.attribute.python, meta.member.access.python, source.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-super         : meta.member.access.python, source.python
+super         : meta.attribute.python, meta.member.access.python, source.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-unicode       : meta.member.access.python, source.python
+unicode       : meta.attribute.python, meta.member.access.python, source.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-foo           : meta.member.access.python, source.python
+foo           : meta.attribute.python, meta.member.access.python, source.python
 some          : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-Exception     : meta.member.access.python, source.python
+Exception     : meta.attribute.python, meta.member.access.python, source.python

test/builtins/builtins4.py

@@ -2,6 +2,7 @@
 
 
 
+
 some_call     : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 A             : meta.function-call.arguments.python, meta.function-call.python, source.python
@@ -10,7 +11,7 @@
 b             : meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
               : meta.function-call.arguments.python, meta.function-call.python, source.python
-c             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, source.python
+c             : meta.function-call.arguments.python, meta.function-call.python, meta.indexed-name.python, meta.item-access.python, source.python
 [             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 1             : constant.numeric.dec.python, meta.function-call.arguments.python, meta.function-call.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 ]             : meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, punctuation.definition.arguments.end.python, source.python

test/calls/call1.py

@@ -29,4 +29,4 @@
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
 None          : keyword.illegal.name.python, meta.member.access.python, source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-baz           : meta.member.access.python, source.python
+baz           : meta.attribute.python, meta.member.access.python, source.python

test/calls/call4.py

@@ -57,7 +57,7 @@
 >>            : keyword.operator.bitwise.python, source.python
 sys           : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-stderr        : meta.member.access.python, source.python
+stderr        : meta.attribute.python, meta.member.access.python, source.python
 ,             : punctuation.separator.element.python, source.python
               : source.python
 "             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
@@ -74,7 +74,7 @@
 =             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 sys           : meta.function-call.arguments.python, meta.function-call.python, source.python
 .             : meta.function-call.arguments.python, meta.function-call.python, meta.member.access.python, punctuation.separator.period.python, source.python
-stderr        : meta.function-call.arguments.python, meta.function-call.python, meta.member.access.python, source.python
+stderr        : meta.attribute.python, meta.function-call.arguments.python, meta.function-call.python, meta.member.access.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
               : meta.function-call.python, source.python

test/calls/print1.py

@@ -34,15 +34,15 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 self          : source.python, variable.language.special.self.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-a             : meta.member.access.python, source.python
+a             : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 a             : source.python
               : source.python
 self          : source.python, variable.language.special.self.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-b             : meta.member.access.python, source.python
+b             : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
@@ -59,17 +59,17 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 a             : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-self          : meta.member.access.python, source.python
+self          : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-self          : meta.member.access.python, source.python
+self          : meta.attribute.python, meta.member.access.python, source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-bar           : meta.member.access.python, source.python
+bar           : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python

test/classes/class11.py

@@ -39,15 +39,15 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 cls           : source.python, variable.language.special.cls.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-a             : meta.member.access.python, source.python
+a             : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 a             : source.python
               : source.python
 cls           : source.python, variable.language.special.cls.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-b             : meta.member.access.python, source.python
+b             : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
@@ -70,15 +70,15 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 a             : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-cls           : meta.member.access.python, source.python
+cls           : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-cls           : meta.member.access.python, source.python
+cls           : meta.attribute.python, meta.member.access.python, source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
 __name__      : meta.member.access.python, source.python, support.variable.magic.python
               : source.python

test/classes/class12.py

@@ -14,7 +14,7 @@
               : source.python
 QQQ           : constant.other.caps.python, source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-bar           : meta.member.access.python, source.python
+bar           : meta.attribute.python, meta.member.access.python, source.python
               : source.python
 baz           : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python

test/expressions/const1.py

@@ -9,7 +9,7 @@
               : source.python
 self          : source.python, variable.language.special.self.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-some_list     : meta.item-access.python, meta.member.access.python, source.python
+some_list     : meta.indexed-name.python, meta.item-access.python, meta.member.access.python, source.python
 [             : meta.item-access.python, meta.member.access.python, punctuation.definition.arguments.begin.python, source.python
 1             : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, meta.member.access.python, source.python
 :             : meta.item-access.arguments.python, meta.item-access.python, meta.member.access.python, punctuation.separator.slice.python, source.python

test/expressions/expr11.py

@@ -5,4 +5,4 @@
 
 foofrom       : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-something     : meta.member.access.python, source.python
+something     : meta.attribute.python, meta.member.access.python, source.python

test/expressions/expr15.py

@@ -6,7 +6,7 @@
 
 a             : source.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-Exception     : meta.member.access.python, source.python
+Exception     : meta.attribute.python, meta.member.access.python, source.python
 Exception     : source.python, support.type.exception.python
 .             : meta.member.access.python, punctuation.separator.period.python, source.python
-a             : meta.member.access.python, source.python
+a             : meta.attribute.python, meta.member.access.python, source.python

test/expressions/expr18.py

@@ -26,7 +26,7 @@
               : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, string.interpolated.python, string.quoted.multi.python
 {             : constant.character.format.placeholder.other.python, meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python
               : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python
-bar           : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, source.python
+bar           : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, meta.indexed-name.python, meta.item-access.python, source.python
 [             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 "             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, meta.item-access.arguments.python, meta.item-access.python, punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 q             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, meta.item-access.arguments.python, meta.item-access.python, source.python, string.quoted.single.python

test/fstrings/nested1.py

@@ -2,6 +2,8 @@ def result_annot(lambda, lambda=) -> qqq[None]:
     pass
 
 
+
+
 def           : meta.function.python, source.python, storage.type.function.python
               : meta.function.python, source.python
 result_annot  : entity.name.function.python, meta.function.python, source.python
@@ -14,7 +16,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : meta.function.python, source.python
 ->            : meta.function.python, punctuation.separator.annotation.result.python, source.python
               : meta.function.python, source.python
-qqq           : meta.function.python, meta.item-access.python, source.python
+qqq           : meta.function.python, meta.indexed-name.python, meta.item-access.python, source.python
 [             : meta.function.python, meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 None          : constant.language.python, meta.function.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 ]             : meta.function.python, meta.item-access.python, punctuation.definition.arguments.end.python, source.python

test/functions/decl2.py

@@ -6,6 +6,8 @@
 def foo(): pass
 
 
+
+
 @             : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.definition.decorator.python, source.python
 a             : entity.name.function.decorator.python, meta.function.decorator.python, source.python
 .             : entity.name.function.decorator.python, meta.function.decorator.python, punctuation.separator.period.python, source.python
@@ -29,7 +31,7 @@ def foo(): pass
 )             : meta.function.decorator.python, punctuation.definition.arguments.end.python, source.python
 . \           : invalid.illegal.decorator.python, meta.function.decorator.python, source.python
               : source.python
-baz           : meta.item-access.python, source.python
+baz           : meta.indexed-name.python, meta.item-access.python, source.python
 [             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 1             : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
 :             : meta.item-access.arguments.python, meta.item-access.python, punctuation.separator.slice.python, source.python