tv nix.vim: support ${lang}Block in NixString

1 files changed, 29 insertions, 10 deletions

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index f6a5cc9c1..4fa3fdda5 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -256,25 +256,44 @@ let
 
     syn cluster NixSubLangs contains=NONE
 
-    ${concatStringsSep "\n" (mapAttrsToList (name: { start ? null }: let
+    ${concatStringsSep "\n" (mapAttrsToList (lang: { extraStart ? null }: let
+      startAlts = filter isString [
+        ''/\* ${lang} \*/''
+        extraStart
+      ];
+      sigil = ''\(${concatStringsSep ''\|'' startAlts}\)[ \t\r\n]*'';
     in /* vim */ ''
-      syn include @${name}Syntax syntax/${name}.vim
-      syn region ${name}Block
+      syn include @${lang}Syntax syntax/${lang}.vim
+      unlet b:current_syntax
+
+      syn region ${lang}Block_NixSTRING
+        \ matchgroup=NixExit
+        \ extend
+        \ start='${replaceStrings ["'"] ["\\'"] sigil}"'
+        \ skip='\\"'
+        \ end='"'
+        \ contains=@${lang}Syntax
+
+      syn region ${lang}Block_NixIND_STRING
         \ matchgroup=NixExit
-        \ start="\(/\* ${name} \*/${optionalString (start != null) ''\|${start}''}\) '''"
+        \ extend
+        \ start="${replaceStrings ["\""] ["\\\""] sigil}'''"
         \ skip="'''\('\|[$]\|\\[nrt]\)"
         \ end="'''"
-        \ contains=@${name}Syntax
-      syn cluster NixSubLangs add=${name}Block,@${name}Syntax
-      unlet b:current_syntax
+        \ contains=@${lang}Syntax
+
+      syn cluster NixSubLangs
+        \ add=@${lang}Syntax,${lang}Block_NixSTRING,${lang}Block_NixIND_STRING
 
-      hi link ${name}Block Statement
+      hi link ${lang}Block_NixSTRING Statement
+      hi link ${lang}Block_NixIND_STRING Statement
     '') {
       c = {};
       cabal = {};
       haskell = {};
-      sh.start = ''write\(Ba\|Da\)sh[^ ]* *\"[^\"]*\"'';
-      vim.start = ''write[^ ]* *\"\(\([^\"]*\.\)\?vimrc\|[^\"]*\.vim\)\"'';
+      sh.extraStart = ''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*"[^"]*"'';
+      vim.extraStart =
+        ''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
     })}
 
     " Clear syntax that interferes with NixBlock.