Fix highlighting of special methods/attributes.

Author: vpetrovykh

grammars/MagicPython.cson

@@ -275,8 +275,7 @@ repository:
         match: "\\b(?<!\\.)(class)\\b"
       }
     ]
-  expression:
-    name: "meta.expression.python"
+  "expression-base":
     comment: "All valid Python expressions"
     patterns: [
       {
@@ -318,9 +317,6 @@ repository:
       {
         include: "#round-braces"
       }
-      {
-        include: "#line-continuation"
-      }
       {
         include: "#function-call"
       }
@@ -334,25 +330,64 @@ repository:
         include: "#builtin-exceptions"
       }
       {
-        include: "#magic-function-names"
+        include: "#magic-names"
       }
       {
-        include: "#magic-variable-names"
+        include: "#special-names"
+      }
+      {
+        include: "#illegal-names"
+      }
+      {
+        include: "#special-variables"
+      }
+      {
+        include: "#line-continuation"
+      }
+      {
+        include: "#ellipsis"
+      }
+    ]
+  expression:
+    comment: "All valid Python expressions"
+    patterns: [
+      {
+        include: "#expression-base"
       }
       {
         include: "#member-access"
       }
+    ]
+  "member-access":
+    begin: "\\.\\s*(?!\\.)"
+    end: "(?<=\\S)(?=\\W)|$"
+    patterns: [
       {
-        include: "#special-names"
+        include: "#function-call"
+      }
+      {
+        include: "#member-access-base"
+      }
+    ]
+  "member-access-base":
+    patterns: [
+      {
+        include: "#magic-names"
       }
       {
         include: "#illegal-names"
       }
       {
-        include: "#special-variables"
+        include: "#illegal-object-name"
       }
       {
-        include: "#ellipsis"
+        include: "#special-names"
+      }
+      {
+        include: "#line-continuation"
+      }
+      {
+        include: "#item-access"
       }
     ]
   "special-names":
@@ -956,18 +991,49 @@ repository:
         match: "\\="
       }
       {
-        include: "#call-wrapper-inheritance"
-      }
-      {
-        include: "#expression"
+        include: "#expression-class"
       }
       {
         name: "support.type.metaclass.python"
         match: "\\bmetaclass\\b"
       }
       {
+        include: "#inheritance-identifier"
+      }
+    ]
+  "inheritance-identifier":
+    match: '''
+      (?x)
+        \\b ([[:alpha:]_]\\w*) \\b
+      
+    '''
+    captures:
+      "1":
         name: "entity.other.inherited-class.python"
-        match: "[[:alnum:]_]+"
+  "expression-class":
+    patterns: [
+      {
+        include: "#call-wrapper-inheritance"
+      }
+      {
+        include: "#expression-base"
+      }
+      {
+        include: "#member-access-class"
+      }
+    ]
+  "member-access-class":
+    begin: "\\.\\s*(?!\\.)"
+    end: "(?<=\\S)(?=\\W)|$"
+    patterns: [
+      {
+        include: "#call-wrapper-inheritance"
+      }
+      {
+        include: "#member-access-base"
+      }
+      {
+        include: "#inheritance-identifier"
       }
     ]
   lambda:
@@ -1132,6 +1198,9 @@ repository:
       {
         include: "#illegal-names"
       }
+      {
+        include: "#illegal-object-name"
+      }
       {
         include: "#parameter-special"
       }
@@ -1371,17 +1440,10 @@ repository:
         include: "#lambda-incomplete"
       }
       {
-        include: "#builtin-callables"
+        include: "#builtin-possible-callables"
       }
       {
-        match: '''
-          (?x)
-            \\b ([[:alpha:]_]\\w*) \\b
-          
-        '''
-        captures:
-          "1":
-            name: "entity.other.inherited-class.python"
+        include: "#inheritance-identifier"
       }
     ]
   "function-call":
@@ -1490,6 +1552,9 @@ repository:
       {
         include: "#illegal-names"
       }
+      {
+        include: "#illegal-object-name"
+      }
       {
         include: "#builtin-exceptions"
       }
@@ -1506,10 +1571,7 @@ repository:
         include: "#builtin-callables"
       }
       {
-        include: "#magic-function-names"
-      }
-      {
-        include: "#magic-variable-names"
+        include: "#magic-names"
       }
     ]
   "builtin-exceptions":
@@ -1625,7 +1687,7 @@ repository:
     comment: "magic variables which a class/module may have."
     match: '''
       (?x)
-        (\\.)?\\b(
+        \\b(
           __(?:
             all | bases | builtins | class | code | debug | defaults | dict
             | doc | file | func | kwdefaults | members
@@ -1637,8 +1699,17 @@ repository:
       
     '''
     captures:
-      "2":
+      "1":
         name: "support.variable.magic.python"
+  "magic-names":
+    patterns: [
+      {
+        include: "#magic-function-names"
+      }
+      {
+        include: "#magic-variable-names"
+      }
+    ]
   "illegal-names":
     name: "keyword.control.flow.python"
     match: '''
@@ -1665,21 +1736,6 @@ repository:
         name: "variable.language.special.self.python"
       "2":
         name: "variable.language.special.cls.python"
-  "member-access":
-    comment: "this rule exists to highlight errors"
-    begin: "\\.(?=\\s*\\w+\\s)"
-    end: "\\s"
-    patterns: [
-      {
-        include: "#illegal-names"
-      }
-      {
-        include: "#illegal-object-name"
-      }
-      {
-        include: "#special-names"
-      }
-    ]
   ellipsis:
     name: "constant.other.ellipsis.python"
     match: "\\.\\.\\."