From 11e769cc2d69fa65803218ec92cb18bc4703fe68 Mon Sep 17 00:00:00 2001 From: niftylettuce Date: Fri, 20 May 2016 04:37:12 -0400 Subject: [PATCH] Add nunjucks support (#8) --- ftdetect/jinja.vim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ftdetect/jinja.vim b/ftdetect/jinja.vim index c23353e..d24d902 100644 --- a/ftdetect/jinja.vim +++ b/ftdetect/jinja.vim @@ -1,14 +1,14 @@ " Figure out which type of hilighting to use for html. fun! s:SelectHTML() -let n = 1 -while n < 50 && n < line("$") - " check for jinja - if getline(n) =~ '{%\s*\(extends\|block\|macro\|set\|if\|for\|include\|trans\)\>' - set ft=jinja - return - endif + let n = 1 + while n < 50 && n <= line("$") + " check for jinja + if getline(n) =~ '{{.*}}\|{%-\?\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\>' + set ft=jinja.html + return + endif let n = n + 1 endwhile endfun -autocmd BufNewFile,BufRead *.html,*.htm call s:SelectHTML() -autocmd BufNewFile,BufRead *.j2,*.jinja2,*.jinja set ft=jinja +autocmd BufNewFile,BufRead *.html,*.htm,*.nunjucks,*.nunjs,*.njk call s:SelectHTML() +autocmd BufNewFile,BufRead *.jinja2,*.j2,*.jinja set ft=jinja