From 67b6d85258890862372bb3cf7c58a9776d52c3de Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 31 Oct 2015 19:53:06 -0700 Subject: [PATCH 1/5] Dummy pythonInclude group to keep pyrex.vim happy. (I don't know how to create an empty group so I just put back "import" into it.) --- syntax/python.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/syntax/python.vim b/syntax/python.vim index e461241..4c5615f 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -157,6 +157,9 @@ syn keyword pythonStatement with syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite syn keyword pythonRepeat for while syn keyword pythonConditional if elif else +" The standard pyrex.vim unconditionally removes the pythonInclude group, so +" we provide a dummy group here to avoid crashing pyrex.vim. +syn keyword pythonInclude import syn keyword pythonImport import syn keyword pythonException try except finally syn keyword pythonOperator and in is not or From e4d992dc44cab00e7aa6cae7ff938b05884503e5 Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Sun, 1 Nov 2015 18:27:15 +0900 Subject: [PATCH 2/5] Correct highlighting async function names in Python 3.5 --- syntax/python.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/python.vim b/syntax/python.vim index e461241..4ad66b3 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -176,7 +176,7 @@ else syn keyword pythonBoolean True False syn match pythonFunction "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained syn keyword pythonStatement await - syn match pythonStatement "\" display + syn match pythonStatement "\" nextgroup=pythonFunction skipwhite syn match pythonStatement "\" display syn match pythonStatement "\" display syn match pythonStatement "\" display From 2ed516d5692ebe742c5968d24399a6017c037b62 Mon Sep 17 00:00:00 2001 From: Dmitry Vasiliev Date: Sun, 1 Nov 2015 18:41:08 +0100 Subject: [PATCH 3/5] Update CHANGES/README --- CHANGES.txt | 4 ++++ README.rst | 1 + syntax/python.vim | 2 +- test.py | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 0452c07..4a555dc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +Revision 3.6.0 (2015-11-XX): + + - Fix 'async def' highlighting. Patch by Joongi Kim + Revision 3.5.0 (2015-06-10): - Add support for 'async ...' and 'await' keywords introduced in diff --git a/README.rst b/README.rst index 7e21687..a45e330 100644 --- a/README.rst +++ b/README.rst @@ -138,6 +138,7 @@ List of the contributors in alphabetical order: - `Ihor Gorobets `_ - `Jeroen Ruigrok van der Werven `_ - `John Eikenberry `_ +- `Joongi Kim `_ - `Marc Weber `_ - `Pedro Algarvio `_ - `Victor Salgado `_ diff --git a/syntax/python.vim b/syntax/python.vim index 4ad66b3..fe42075 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -31,6 +31,7 @@ " Ihor Gorobets " Jeroen Ruigrok van der Werven " John Eikenberry +" Joongi Kim " Marc Weber " Pedro Algarvio " Victor Salgado @@ -179,7 +180,6 @@ else syn match pythonStatement "\" nextgroup=pythonFunction skipwhite syn match pythonStatement "\" display syn match pythonStatement "\" display - syn match pythonStatement "\" display endif " diff --git a/test.py b/test.py index b80ea1e..df81a9a 100644 --- a/test.py +++ b/test.py @@ -18,6 +18,11 @@ class Classname def функция class Класс +await +async def Test +async with +async for + # Builtin objects. True False Ellipsis None NotImplemented From ad932f52425260bb56f76f4967ebd74a369a5af3 Mon Sep 17 00:00:00 2001 From: Dmitry Vasiliev Date: Sun, 1 Nov 2015 18:58:42 +0100 Subject: [PATCH 4/5] Update CHANGES/README --- CHANGES.txt | 2 ++ README.rst | 1 + syntax/python.vim | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 4a555dc..2d3b520 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ Revision 3.6.0 (2015-11-XX): - Fix 'async def' highlighting. Patch by Joongi Kim + - Add dummy 'pythonInclude' group to avoid crashing standard pyrex.vim. + Patch by Antony Lee Revision 3.5.0 (2015-06-10): diff --git a/README.rst b/README.rst index a45e330..f9cd20d 100644 --- a/README.rst +++ b/README.rst @@ -132,6 +132,7 @@ List of the contributors in alphabetical order: - `Andrea Riciputi `_ - Anton Butanaev +- `Antony Lee `_ - Caleb Adamantine - `David Briscoe `_ - `Elizabeth Myers `_ diff --git a/syntax/python.vim b/syntax/python.vim index 89ade79..f19a12c 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -25,6 +25,7 @@ " " Andrea Riciputi " Anton Butanaev +" Antony Lee " Caleb Adamantine " David Briscoe " Elizabeth Myers From 69760cb3accce488cc072772ca918ac2cbf384ba Mon Sep 17 00:00:00 2001 From: Dmitry Vasiliev Date: Sun, 1 Nov 2015 19:52:45 +0100 Subject: [PATCH 5/5] Update version and last change date --- syntax/python.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/python.vim b/syntax/python.vim index f19a12c..e963628 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -3,9 +3,9 @@ " Current Maintainer: Dmitry Vasiliev " Previous Maintainer: Neil Schemenauer " URL: https://github.com/hdima/python-syntax -" Last Change: 2015-06-10 +" Last Change: 2015-11-01 " Filenames: *.py -" Version: 3.5.0 +" Version: 3.6.0 " " Based on python.vim (from Vim 6.1 distribution) " by Neil Schemenauer