Fix detecting jinja templates, #553

sheerun · sheerun · commit 7e2d060f880a · 2020-09-23T23:25:01.000+02:00
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
@@ -370,6 +370,12 @@ func! polyglot#DetectHtmlFiletype()
   if line =~# '^\(%\|<[%&].*>\)'
     set ft=mason | return
   endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)'
+      set ft=jinja.html | return
+    endif
+  endfor
   set ft=html | return
 endfunc
 
diff --git a/heuristics.yaml b/heuristics.yaml
@@ -180,5 +180,8 @@ rules:
 - lines: 1
   pattern: '^(%|<[%&].*>)'
   filetype: mason
+- lines: 50
+  pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b'
+  filetype: jinja.html
 - filetype: html
 
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
diff --git a/tests/extensions.vim b/tests/extensions.vim
@@ -356,3 +356,6 @@ call TestExtension("tt2html", "html.tt2", "<html>")
 call TestExtension("html", "empty.html", "")
 call TestExtension("mason", "mason1.html", "% my $planet = 42;")
 call TestExtension("mason", "mason2.html", "<%filter></%filter>")
+call TestExtension("jinja.html", "jinja.html", "{{ item.href }}")
+call TestExtension("jinja.html", "jinja.html", "{% for item in navigation %}{% endfor %}")
+call TestExtension("jinja.html", "jinja.html", "{% block head %}")
