vim/UltiSnips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite syntax matching for global

Browse Source 
The body of a global now only has Python syntax coloring if the trigger
is !p. This matches the actual behavior of UltiSnips. AFAIK right now
globals with other triggers are useless, but this opens the door to
proper syntax coloring for those if they ever gain a use.
This commit is contained in:
Kevin Ballard 2014-06-29 23:44:22 -07:00
parent cb2905c178
commit d239402b7f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
syntax/snippets.vim
View File

@ -61,9 +61,19 @@ syn region snipVarExpansion matchgroup=Define start="\${\d*" end="}" contained c
" global {{{3 " global {{{3
syn match snipGlobalStart "^global.*" contained contains=snipKeyword,snipString " Generic (non-Python) {{{4
syn match snipGlobalEnd "^endglobal" contained contains=snipKeyword syn region snipGlobal start="^global\_s" end="^endglobal\s*$" contains=snipGlobalHeader fold keepend
syn region snipGlobal fold keepend start="^global" end="^endglobal" contains=snipGlobalStart,snipGlobalEnd,snipLeadingSpaces,snipTabsOnly,snipCommand,snipVarExpansion,snipVar,@Python syn match snipGlobalHeader "^.*$" nextgroup=snipGlobalBody skipnl contained contains=snipGlobalHeaderKeyword
syn match snipGlobalHeaderKeyword "^global" contained nextgroup=snipSnippetTrigger
syn region snipGlobalBody start="\_." end="^\zeendglobal\s*$" contained contains=snipTabsOnly,snipLeadingSpaces nextgroup=snipGlobalFooter
syn match snipGlobalFooter "^endglobal.*" contained contains=snipGlobalFooterKeyword
syn match snipGlobalFooterKeyword "^endglobal" contained
" Python (!p) {{{4
syn region snipGlobal start="^global\s\+!p\_s\@=" end="^endglobal\s*$" contains=snipGlobalPHeader fold keepend
syn match snipGlobalPHeader "^.*$" nextgroup=snipGlobalPBody skipnl contained contains=snipGlobalHeaderKeyword
syn region snipGlobalPBody start="\_." end="^\zeendglobal\s*$" contained contains=snipTabsOnly,snipLeadingSpaces,@Python nextgroup=snipGlobalFooter
" priority {{{3 " priority {{{3
@ -86,13 +96,13 @@ hi def link snipTabsOnly Error
hi def link snipKeyword Keyword hi def link snipKeyword Keyword
hi def link snipExtendsKeyword Keyword hi def link snipExtendsKeyword snipKeyword
hi def link snipSnippetHeaderKeyword snipKeyword hi def link snipSnippetHeaderKeyword snipKeyword
hi def link snipSnippetFooterKeyword snipKeyword hi def link snipSnippetFooterKeyword snipKeyword
hi def link snipStart Statement hi def link snipGlobalHeaderKeyword snipKeyword
hi def link snipEnd snipStart hi def link snipGlobalFooterKeyword snipKeyword
hi def link snipCommand Special hi def link snipCommand Special
hi def link snipCommandDelim snipCommand hi def link snipCommandDelim snipCommand
@ -107,10 +117,6 @@ hi def link snipVarExpansion Normal
hi def link snipVisual Normal hi def link snipVisual Normal
hi def link snipSnippet Normal hi def link snipSnippet Normal
hi def link snipGlobalStart Statement
hi def link snipGlobalEnd Statement
hi def link snipGlobal Normal
hi def link snipPriorityKeyword Keyword hi def link snipPriorityKeyword Keyword
hi def link snipPriorityValue Number hi def link snipPriorityValue Number