From 41efca646e4b367effabe1493fbe9501e2cc3c43 Mon Sep 17 00:00:00 2001
From: Michael Doronin <warrior2031@gmail.com>
Date: Thu, 8 Dec 2016 12:55:36 +0300
Subject: [PATCH] simplified rules for yield, yield from, from * import

---
 syntax/python.vim | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/syntax/python.vim b/syntax/python.vim
index 0c79997..6ddcafa 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -154,7 +154,7 @@ syn keyword pythonInstanceVariable self
 syn keyword pythonClassVaraible cls
 syn keyword pythonStatement     break continue del
 syn keyword pythonStatement     exec return
-syn keyword pythonStatement     pass
+syn keyword pythonStatement     pass yield
 syn keyword pythonStatement     raise nextgroup=pythonIdentifier skipwhite
 syn keyword pythonStatement     global assert
 syn keyword pythonStatement     lambda
@@ -171,7 +171,7 @@ syn keyword pythonInclude       import
 syn keyword pythonImport        import
 syn match pythonIdentifier "\v[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters
 syn match pythonRaiseFromStatement      "from\>"
-syn match pythonImport          "\v^\s*\zsfrom\ze\s*[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z_][a-zA-Z0-9_]*)*\s*import"
+syn match pythonImport          "^\s*\zsfrom\>"
 
 
 
@@ -183,7 +183,6 @@ if s:Python2Syntax()
   syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained
 else
   syn keyword pythonStatement   as nonlocal
-  syn match   pythonStatement "\v\s*<yield\s+from>"
   syn match   pythonStatement   "\v(\.)@<!<await>"
   syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained
   syn match   pythonStatement   "\<async\s\+def\>" nextgroup=pythonFunction skipwhite