from highlighted in imports but not in yield from (not sure how this

works)
This commit is contained in:
Michael Doronin
2016-11-23 12:58:23 +03:00
parent f3bd1e155f
commit 0a240893e8

View File

@@ -165,12 +165,12 @@ syn keyword pythonConditional if elif else
" we provide a dummy group here to avoid crashing pyrex.vim. " we provide a dummy group here to avoid crashing pyrex.vim.
syn keyword pythonInclude import syn keyword pythonInclude import
syn keyword pythonImport import syn keyword pythonImport import
syn match pythonImport "\(yield \)\@<!\<from\>" syn keyword pythonImport from
syn keyword pythonException try except finally syn keyword pythonException try except finally
syn keyword pythonOperator and in is not or syn keyword pythonOperator and in is not or
syn match pythonStatement "^\s*yield\>" display syn match pythonStatement "\s*\([.,]\)\@<!\<yield\>"
syn match pythonIdentifier "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display syn match pythonIdentifier "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters
if s:Python2Syntax() if s:Python2Syntax()
if !s:Enabled("g:python_print_as_function") if !s:Enabled("g:python_print_as_function")
@@ -180,12 +180,12 @@ if s:Python2Syntax()
syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained
else else
syn keyword pythonStatement as nonlocal syn keyword pythonStatement as nonlocal
syn match pythonStatement "\v\s*<yield\s+from>" display syn match pythonStatement "\v\s*<yield\s+from>"
syn match pythonStatement "\v(\.)@<!<await>" syn match pythonStatement "\v(\.)@<!<await>"
syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained syn match pythonFunction "[a-zA-Z_][a-zA-Z0-9_]*" nextgroup=FunctionParameters display contained
syn match pythonStatement "\<async\s\+def\>" nextgroup=pythonFunction skipwhite syn match pythonStatement "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
syn match pythonStatement "\<async\s\+with\>" display syn match pythonStatement "\<async\s\+with\>"
syn match pythonStatement "\<async\s\+for\>" display syn match pythonStatement "\<async\s\+for\>"
endif endif
syn region FunctionParameters start='(' end=')' display contains= syn region FunctionParameters start='(' end=')' display contains=