From 954029739a65d662b6381dae731bea5668907c59 Mon Sep 17 00:00:00 2001
From: Yury Selivanov <yury@magic.io>
Date: Thu, 4 Oct 2018 17:09:28 -0400
Subject: [PATCH] Add support for new Python 3.7 attrs/builtins

Fixes #151 and #126
---
 .gitignore                           |  2 +-
 grammars/MagicPython.cson            | 10 ++++----
 grammars/MagicPython.tmLanguage      | 10 ++++----
 grammars/src/MagicPython.syntax.yaml | 10 ++++----
 test/atom-spec/python-spec.js        | 36 ++++++++++++++++++++++++++++
 test/builtins/builtins7.py           |  8 +++++++
 test/expressions/special2.py         | 16 +++++++++++++
 7 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 test/builtins/builtins7.py
 create mode 100644 test/expressions/special2.py

diff --git a/.gitignore b/.gitignore
index 4377bfda..e17b261b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ node_modules
 .DS_Store
 *.cache
 *.pyc
-
+package-lock.json
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
index 71050143..c3f182d4 100644
--- a/grammars/MagicPython.cson
+++ b/grammars/MagicPython.cson
@@ -1729,7 +1729,7 @@ repository:
         match: '''
           (?x)
             (?<!\\.) \\b(
-              __import__ | abs | all | any | ascii | bin | callable
+              __import__ | abs | all | any | ascii | bin | breakpoint | callable
               | chr | compile | copyright | credits | delattr | dir | divmod
               | enumerate | eval | exec | exit | filter | format | getattr
               | globals | hasattr | hash | help | hex | id | input
@@ -1810,10 +1810,10 @@ repository:
       (?x)
         \\b(
           __(?:
-            all | bases | builtins | class | code | debug | defaults | dict
-            | doc | file | func | kwdefaults | members
-            | metaclass | methods | module | mro | name
-            | qualname | self | signature | slots | subclasses
+            all | bases | builtins | class | class_getitem | code | debug
+            | defaults | dict | doc | file | func | kwdefaults | members
+            | metaclass | methods | module | mro | mro_entries | name
+            | qualname | post_init | self | signature | slots | subclasses
             | version | weakref | wrapped | annotations | classcell
             | spec | path | package | future | traceback
           )__
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
index c2990dae..5a92c63d 100644
--- a/grammars/MagicPython.tmLanguage
+++ b/grammars/MagicPython.tmLanguage
@@ -2708,7 +2708,7 @@
             <key>match</key>
             <string>(?x)
   (?&lt;!\.) \b(
-    __import__ | abs | all | any | ascii | bin | callable
+    __import__ | abs | all | any | ascii | bin | breakpoint | callable
     | chr | compile | copyright | credits | delattr | dir | divmod
     | enumerate | eval | exec | exit | filter | format | getattr
     | globals | hasattr | hash | help | hex | id | input
@@ -2798,10 +2798,10 @@ indirectly through syntactic constructs
         <string>(?x)
   \b(
     __(?:
-      all | bases | builtins | class | code | debug | defaults | dict
-      | doc | file | func | kwdefaults | members
-      | metaclass | methods | module | mro | name
-      | qualname | self | signature | slots | subclasses
+      all | bases | builtins | class | class_getitem | code | debug
+      | defaults | dict | doc | file | func | kwdefaults | members
+      | metaclass | methods | module | mro | mro_entries | name
+      | qualname | post_init | self | signature | slots | subclasses
       | version | weakref | wrapped | annotations | classcell
       | spec | path | package | future | traceback
     )__
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
index 536bd32e..2be48ca1 100644
--- a/grammars/src/MagicPython.syntax.yaml
+++ b/grammars/src/MagicPython.syntax.yaml
@@ -1294,7 +1294,7 @@ repository:
         match: |
           (?x)
             (?<!\.) \b(
-              __import__ | abs | all | any | ascii | bin | callable
+              __import__ | abs | all | any | ascii | bin | breakpoint | callable
               | chr | compile | copyright | credits | delattr | dir | divmod
               | enumerate | eval | exec | exit | filter | format | getattr
               | globals | hasattr | hash | help | hex | id | input
@@ -1364,10 +1364,10 @@ repository:
       (?x)
         \b(
           __(?:
-            all | bases | builtins | class | code | debug | defaults | dict
-            | doc | file | func | kwdefaults | members
-            | metaclass | methods | module | mro | name
-            | qualname | self | signature | slots | subclasses
+            all | bases | builtins | class | class_getitem | code | debug
+            | defaults | dict | doc | file | func | kwdefaults | members
+            | metaclass | methods | module | mro | mro_entries | name
+            | qualname | post_init | self | signature | slots | subclasses
             | version | weakref | wrapped | annotations | classcell
             | spec | path | package | future | traceback
           )__
diff --git a/test/atom-spec/python-spec.js b/test/atom-spec/python-spec.js
index 9660b781..270b752b 100644
--- a/test/atom-spec/python-spec.js
+++ b/test/atom-spec/python-spec.js
@@ -514,6 +514,17 @@ describe("Grammar Tests", function() {
       expect(tokens[1][3].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
     });
 
+  it("test/builtins/builtins7.py", 
+    function() {
+      tokens = grammar.tokenizeLines("breakpoint()")
+      expect(tokens[0][0].value).toBe("breakpoint");
+      expect(tokens[0][0].scopes).toEqual(["source.python","meta.function-call.python","support.function.builtin.python"]);
+      expect(tokens[0][1].value).toBe("(");
+      expect(tokens[0][1].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[0][2].value).toBe(")");
+      expect(tokens[0][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+    });
+
   it("test/calls/call1.py", 
     function() {
       tokens = grammar.tokenizeLines("some_call(A, b, c[1], *args, FOO=lambda:{'q': 42}, **kwargs)")
@@ -6177,6 +6188,31 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
     });
 
+  it("test/expressions/special2.py", 
+    function() {
+      tokens = grammar.tokenizeLines("__post_init__\ndef __class_getitem__(): pass\n__mro_entries__")
+      expect(tokens[0][0].value).toBe("__post_init__");
+      expect(tokens[0][0].scopes).toEqual(["source.python","support.variable.magic.python"]);
+      expect(tokens[1][0].value).toBe("def");
+      expect(tokens[1][0].scopes).toEqual(["source.python","meta.function.python","storage.type.function.python"]);
+      expect(tokens[1][1].value).toBe(" ");
+      expect(tokens[1][1].scopes).toEqual(["source.python","meta.function.python"]);
+      expect(tokens[1][2].value).toBe("__class_getitem__");
+      expect(tokens[1][2].scopes).toEqual(["source.python","meta.function.python","support.variable.magic.python"]);
+      expect(tokens[1][3].value).toBe("(");
+      expect(tokens[1][3].scopes).toEqual(["source.python","meta.function.python","meta.function.parameters.python","punctuation.definition.parameters.begin.python"]);
+      expect(tokens[1][4].value).toBe(")");
+      expect(tokens[1][4].scopes).toEqual(["source.python","meta.function.python","meta.function.parameters.python","punctuation.definition.parameters.end.python"]);
+      expect(tokens[1][5].value).toBe(":");
+      expect(tokens[1][5].scopes).toEqual(["source.python","meta.function.python","punctuation.section.function.begin.python"]);
+      expect(tokens[1][6].value).toBe(" ");
+      expect(tokens[1][6].scopes).toEqual(["source.python"]);
+      expect(tokens[1][7].value).toBe("pass");
+      expect(tokens[1][7].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[2][0].value).toBe("__mro_entries__");
+      expect(tokens[2][0].scopes).toEqual(["source.python","support.variable.magic.python"]);
+    });
+
   it("test/fstrings/comment1.py", 
     function() {
       tokens = grammar.tokenizeLines("f'prefix{10 # comment, making the string technically illegal\ndef foo(): pass")
diff --git a/test/builtins/builtins7.py b/test/builtins/builtins7.py
new file mode 100644
index 00000000..eb02d7fb
--- /dev/null
+++ b/test/builtins/builtins7.py
@@ -0,0 +1,8 @@
+breakpoint()
+
+
+
+
+breakpoint    : meta.function-call.python, source.python, support.function.builtin.python
+(             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
+)             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
diff --git a/test/expressions/special2.py b/test/expressions/special2.py
new file mode 100644
index 00000000..2f360985
--- /dev/null
+++ b/test/expressions/special2.py
@@ -0,0 +1,16 @@
+__post_init__
+def __class_getitem__(): pass
+__mro_entries__
+
+
+
+__post_init__ : source.python, support.variable.magic.python
+def           : meta.function.python, source.python, storage.type.function.python
+              : meta.function.python, source.python
+__class_getitem__ : meta.function.python, source.python, support.variable.magic.python
+(             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.begin.python, source.python
+)             : meta.function.parameters.python, meta.function.python, punctuation.definition.parameters.end.python, source.python
+:             : meta.function.python, punctuation.section.function.begin.python, source.python
+              : source.python
+pass          : keyword.control.flow.python, source.python
+__mro_entries__ : source.python, support.variable.magic.python