Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv nix.vim: add quoting for STRING

Browse Source
This commit is contained in:
tv 2016-06-12 21:25:03 +02:00
parent e079214f43
commit 8237c8606e
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tv/2configs/vim.nix
View File

@ -229,7 +229,6 @@ let
\ skip="'''\('\|[$]\|\\[nrt]\)" \ skip="'''\('\|[$]\|\\[nrt]\)"
\ end="'''" \ end="'''"
syn cluster NixStrings contains=NixSTRING,NixIND_STRING
syn match NixOther /[():/;=.,?\[\]]/ syn match NixOther /[():/;=.,?\[\]]/
syn match NixCommentMatch /\(^\|\s\)#.*/ syn match NixCommentMatch /\(^\|\s\)#.*/
@ -251,13 +250,12 @@ let
hi link NixIND_STRING NixData hi link NixIND_STRING NixData
hi link NixEnter NixCode hi link NixEnter NixCode
hi link NixExit NixData
hi link NixOther NixCode hi link NixOther NixCode
hi link NixQuote NixData hi link NixQuote NixData
hi link NixQuote2 NixQuote
hi link NixQuote3 NixQuote
syn cluster NixSubLangs contains=NONE syn cluster nix_has_dollar_curly contains=@nix_ind_strings,@nix_strings
syn cluster nix_ind_strings contains=NixIND_STRING
syn cluster nix_strings contains=NixSTRING
${concatStringsSep "\n" (mapAttrsToList (lang: { extraStart ? null }: let ${concatStringsSep "\n" (mapAttrsToList (lang: { extraStart ? null }: let
startAlts = filter isString [ startAlts = filter isString [
@ -271,10 +269,10 @@ let
syn match nix_${lang}_sigil syn match nix_${lang}_sigil
\ X${replaceStrings ["X"] ["\\X"] sigil}\ze\('''\|"\)X \ X${replaceStrings ["X"] ["\\X"] sigil}\ze\('''\|"\)X
\ nextgroup=nix_${lang}_region \ nextgroup=nix_${lang}_region_IND_STRING,nix_${lang}_region_STRING
\ transparent \ transparent
syn region nix_${lang}_region syn region nix_${lang}_region_STRING
\ matchgroup=NixSTRING \ matchgroup=NixSTRING
\ start='"' \ start='"'
\ skip='\\"' \ skip='\\"'
@ -282,7 +280,7 @@ let
\ contained \ contained
\ contains=@nix_${lang}_syntax \ contains=@nix_${lang}_syntax
syn region nix_${lang}_region syn region nix_${lang}_region_IND_STRING
\ matchgroup=NixIND_STRING \ matchgroup=NixIND_STRING
\ start="'''" \ start="'''"
\ skip="'''\('\|[$]\|\\[nrt]\)" \ skip="'''\('\|[$]\|\\[nrt]\)"
@ -290,8 +288,14 @@ let
\ contained \ contained
\ contains=@nix_${lang}_syntax \ contains=@nix_${lang}_syntax
syn cluster NixSubLangs syn cluster nix_ind_strings
\ add=nix_${lang}_region,@nix_${lang}_syntax \ add=nix_${lang}_region_IND_STRING
syn cluster nix_strings
\ add=nix_${lang}_region_STRING
syn cluster nix_has_dollar_curly
\ add=@nix_${lang}_syntax
'') { '') {
c = {}; c = {};
cabal = {}; cabal = {};
@ -310,7 +314,7 @@ let
\ start="[$]{" \ start="[$]{"
\ end="}" \ end="}"
\ contains=TOP \ contains=TOP
\ containedin=@NixSubLangs,@NixStrings \ containedin=@nix_has_dollar_curly
syn region NixBlockHack syn region NixBlockHack
\ matchgroup=NixEnter \ matchgroup=NixEnter
@ -318,9 +322,13 @@ let
\ end="}" \ end="}"
\ contains=TOP \ contains=TOP
syn match NixQuote "'''[$]"he=e-1 contained containedin=@NixSubLangs syn match NixQuote /'''\([''$']\|\\.\)/he=s+2
syn match NixQuote2 "''''"he=s+1 contained containedin=@NixSubLangs \ containedin=@nix_ind_strings
syn match NixQuote3 "'''\\[nrt]" contained containedin=@NixSubLangs \ contained
syn match NixQuote /\\./he=s+1
\ containedin=@nix_strings
\ contained
syn sync fromstart syn sync fromstart