From 7b185cc2f3e1062ade8f377b5491bee966d362ad Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Fri, 23 Oct 2015 20:49:05 +0100 Subject: [PATCH 1/2] Switch to MagicPython for Python sources --- .gitmodules | 3 +++ grammars.yml | 3 ++- vendor/grammars/MagicPython | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/MagicPython diff --git a/.gitmodules b/.gitmodules index be2d7b30..c1975e6e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -683,3 +683,6 @@ [submodule "vendor/grammars/FreeMarker.tmbundle"] path = vendor/grammars/FreeMarker.tmbundle url = https://github.com/freemarker/FreeMarker.tmbundle +[submodule "vendor/grammars/MagicPython"] + path = vendor/grammars/MagicPython + url = git@github.com:MagicStack/MagicPython.git diff --git a/grammars.yml b/grammars.yml index 4eee0d23..19f55efa 100644 --- a/grammars.yml +++ b/grammars.yml @@ -346,8 +346,9 @@ vendor/grammars/language-jsoniq/: - source.xq vendor/grammars/language-ncl: - source.ncl -vendor/grammars/language-python: +vendor/grammars/MagicPython: - source.python +vendor/grammars/language-python: - source.regexp.python - text.python.console - text.python.traceback diff --git a/vendor/grammars/MagicPython b/vendor/grammars/MagicPython new file mode 160000 index 00000000..13bf5348 --- /dev/null +++ b/vendor/grammars/MagicPython @@ -0,0 +1 @@ +Subproject commit 13bf534834036911c57d15c40242e45783aad1ba From 3e665099ac84e0b2307c034aa4d2da7a1726e60e Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Sat, 2 Jan 2016 22:04:16 -0500 Subject: [PATCH 2/2] Updating Python grammars --- grammars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grammars.yml b/grammars.yml index 004f9cb0..2b7b5c8d 100644 --- a/grammars.yml +++ b/grammars.yml @@ -69,6 +69,9 @@ vendor/grammars/Lean.tmbundle: - source.lean vendor/grammars/LiveScript.tmbundle: - source.livescript +vendor/grammars/MagicPython: +- source.python +- source.regexp.python vendor/grammars/Modelica/: - source.modelica vendor/grammars/NSIS: @@ -355,10 +358,7 @@ vendor/grammars/language-maxscript: - source.maxscript vendor/grammars/language-ncl: - source.ncl -vendor/grammars/MagicPython: -- source.python vendor/grammars/language-python: -- source.regexp.python - text.python.console - text.python.traceback vendor/grammars/language-renpy: