Scope 'super' with support.type.python

1st1 · 1st1 · commit bff4e71412ab · 2015-10-20T12:16:15.000-04:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -1472,7 +1472,7 @@ repository:
           | isinstance | issubclass | iter | len | license | locals | map
           | max | memoryview | min | next | oct | open | ord | pow | print
           | quit | range | reload | repr | reversed | round
-          | setattr | sorted | sum | super | vars | zip
+          | setattr | sorted | sum | vars | zip
         )\\b
       
     '''
@@ -1484,6 +1484,11 @@ repository:
           bool | bytearray | bytes | classmethod | complex | dict
           | float | frozenset | int | list | object | property
           | set | slice | staticmethod | str | tuple | type
+      
+          (?# Although 'super' is not a type, it's related to types,
+              and is special enough to be highlighted differently from
+              other built-ins)
+          | super
         )\\b
       
     '''
diff --git a/grammars/MagicPython.syntax.yaml b/grammars/MagicPython.syntax.yaml
@@ -984,7 +984,7 @@ repository:
           | isinstance | issubclass | iter | len | license | locals | map
           | max | memoryview | min | next | oct | open | ord | pow | print
           | quit | range | reload | repr | reversed | round
-          | setattr | sorted | sum | super | vars | zip
+          | setattr | sorted | sum | vars | zip
         )\b
   builtin-types:
     name: support.type.python
@@ -994,6 +994,11 @@ repository:
           bool | bytearray | bytes | classmethod | complex | dict
           | float | frozenset | int | list | object | property
           | set | slice | staticmethod | str | tuple | type
+
+          (?# Although 'super' is not a type, it's related to types,
+              and is special enough to be highlighted differently from
+              other built-ins)
+          | super
         )\b
 
   magic-function-names:
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -2361,7 +2361,7 @@ it&apos;s not tokenized as ellipsis.
     | isinstance | issubclass | iter | len | license | locals | map
     | max | memoryview | min | next | oct | open | ord | pow | print
     | quit | range | reload | repr | reversed | round
-    | setattr | sorted | sum | super | vars | zip
+    | setattr | sorted | sum | vars | zip
   )\b
 </string>
       </dict>
@@ -2375,6 +2375,11 @@ it&apos;s not tokenized as ellipsis.
     bool | bytearray | bytes | classmethod | complex | dict
     | float | frozenset | int | list | object | property
     | set | slice | staticmethod | str | tuple | type
+
+    (?# Although &apos;super&apos; is not a type, it&apos;s related to types,
+        and is special enough to be highlighted differently from
+        other built-ins)
+    | super
   )\b
 </string>
       </dict>
diff --git a/test/expressions/expr13.py b/test/expressions/expr13.py
@@ -0,0 +1,7 @@
+super()
+
+
+
+super         : meta.function-call.python, source.python, support.type.python
+(             : meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
