Merge pull request python-mode#627 from andriykohut/async-await-syntax

klen · klen · commit fa0ff7dc805c · 2016-01-11T19:57:36.000+03:00
add async/await syntax
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -628,6 +628,10 @@ Highlight "print" as a function            *'g:pymode_syntax_print_as_function'*
 >
     let g:pymode_syntax_print_as_function = 0
 
+Highlight "async/await" keywords       *'g:pymode_syntax_highlight_async_await'*
+>
+    let g:pymode_syntax_highlight_async_await = g:pymode_syntax_all
+
 Highlight '=' operator              *'g:pymode_syntax_highlight_equal_operator'*
 >
     let g:pymode_syntax_highlight_equal_operator = g:pymode_syntax_all
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -16,6 +16,9 @@ call pymode#default('g:pymode_syntax_all', 1)
 
 " Highlight 'print' as function
 call pymode#default("g:pymode_syntax_print_as_function", 0)
+"
+" Highlight 'async/await' keywords
+call pymode#default("g:pymode_syntax_highlight_async_await", g:pymode_syntax_all)
 
 " Highlight '=' operator
 call pymode#default('g:pymode_syntax_highlight_equal_operator', g:pymode_syntax_all)
@@ -101,6 +104,13 @@ endif
         syn keyword pythonStatement print
     endif
 
+    if g:pymode_syntax_highlight_async_await
+        syn keyword pythonStatement async await
+        syn match pythonStatement "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
+        syn match pythonStatement "\<async\s\+with\>" display
+        syn match pythonStatement "\<async\s\+for\>" nextgroup=pythonRepeat skipwhite
+    endif
+
     if g:pymode_syntax_highlight_equal_operator
         syn match pythonExtraOperator "\%(=\)"
     endif
diff --git a/t/syntax.vim b/t/syntax.vim
@@ -13,6 +13,7 @@ describe 'pymode-syntax'
         Expect g:pymode_syntax == 1
         Expect g:pymode_syntax_all == 1
         Expect g:pymode_syntax_print_as_function == 0
+        Expect g:pymode_syntax_highlight_async_await == 1
         Expect g:pymode_syntax_highlight_equal_operator == 1
         Expect g:pymode_syntax_highlight_stars_operator == 1
         Expect g:pymode_syntax_highlight_self == 1

Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,10 @@ Highlight "print" as a function 'g:pymode_syntax_print_as_function'`
`628`	`628`	`>`
`629`	`629`	`let g:pymode_syntax_print_as_function = 0`
`630`	`630`
	`631`	`+Highlight "async/await" keywords 'g:pymode_syntax_highlight_async_await'`
	`632`	`+>`
	`633`	`+ let g:pymode_syntax_highlight_async_await = g:pymode_syntax_all`
	`634`	`+`
`631`	`635`	`Highlight '=' operator 'g:pymode_syntax_highlight_equal_operator'`
`632`	`636`	`>`
`633`	`637`	`let g:pymode_syntax_highlight_equal_operator = g:pymode_syntax_all`