Improve django detection, closes #585

sheerun · Oct 14, 2020 · ba11e0f · ba11e0f
1 parent c45f0b8
commit ba11e0f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
@@ -298,7 +298,7 @@ func! polyglot#detect#Html(...)
   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\)\(\<\|\>\)\|{#\s\+'
+    if line =~# '{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\|load\)\(\<\|\>\)\|{#\s\+'
       set ft=htmldjango | return
     endif
     if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'

diff --git a/heuristics.yaml b/heuristics.yaml
@@ -188,7 +188,7 @@ rules:
   filetype: mason
 - lines: 50
   rules:
-  - pattern: '{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
+  - pattern: '{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans|load)\b|{#\s+'
     filetype: htmldjango
   - pattern: '\bDTD\s+XHTML\s'
     filetype: xhtml

diff --git a/tests/extensions.vim b/tests/extensions.vim
@@ -371,6 +371,7 @@ call TestExtension("mason", "mason2.html", "<%filter></%filter>")
 call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{% endfor %}")
 call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
 call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
+call TestExtension("htmldjango", "jinja3.html", "{% load static %}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
 
 " many html templates use {{ }}, e.g. Angular, we should not assume django