tv nix.vim: transparent nix_*_region_* and curly blocks

This commit is contained in:
tv 2016-06-12 21:28:31 +02:00
parent 8237c8606e
commit ac3b87b9a6

View File

@ -279,6 +279,7 @@ let
\ end='"' \ end='"'
\ contained \ contained
\ contains=@nix_${lang}_syntax \ contains=@nix_${lang}_syntax
\ transparent
syn region nix_${lang}_region_IND_STRING syn region nix_${lang}_region_IND_STRING
\ matchgroup=NixIND_STRING \ matchgroup=NixIND_STRING
@ -287,6 +288,7 @@ let
\ end="'''" \ end="'''"
\ contained \ contained
\ contains=@nix_${lang}_syntax \ contains=@nix_${lang}_syntax
\ transparent
syn cluster nix_ind_strings syn cluster nix_ind_strings
\ add=nix_${lang}_region_IND_STRING \ add=nix_${lang}_region_IND_STRING
@ -305,22 +307,24 @@ let
''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"''; ''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
})} })}
" Clear syntax that interferes with NixBlock. " Clear syntax that interferes with nixINSIDE_DOLLAR_CURLY.
" TODO redefine NixBlock so syntax don't have to be cleared syn clear shVarAssign
syn clear shOperator shSetList shVarAssign
syn region NixBlock syn region nixINSIDE_DOLLAR_CURLY
\ matchgroup=NixEnter \ matchgroup=NixEnter
\ start="[$]{" \ start="[$]{"
\ end="}" \ end="}"
\ contains=TOP \ contains=TOP
\ containedin=@nix_has_dollar_curly \ containedin=@nix_has_dollar_curly
\ transparent
syn region NixBlockHack syn region nix_inside_curly
\ matchgroup=NixEnter \ matchgroup=NixEnter
\ start="{" \ start="{"
\ end="}" \ end="}"
\ contains=TOP \ contains=TOP
\ containedin=nixINSIDE_DOLLAR_CURLY,nix_inside_curly
\ transparent
syn match NixQuote /'''\([''$']\|\\.\)/he=s+2 syn match NixQuote /'''\([''$']\|\\.\)/he=s+2
\ containedin=@nix_ind_strings \ containedin=@nix_ind_strings