m-vim_plugins/vim-polyglot
1
0
Fork 0
mirror of https://github.com/sheerun/vim-polyglot.git synced 2025-11-10 12:33:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve django detection, closes #585

Browse Source
This commit is contained in:
Adam Stankiewicz
2020-10-14 23:26:36 +02:00
parent c45f0b8f64
commit ba11e0f1ad
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/polyglot/detect.vim
View File

@@ -298,7 +298,7 @@ func! polyglot#detect#Html(...)
endif endif
for lnum in range(1, min([line("$"), 50])) for lnum in range(1, min([line("$"), 50]))
let line = getline(lnum) 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 set ft=htmldjango | return
endif endif
if line =~# '\(\<\|\>\)DTD\s\+XHTML\s' if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'

2
heuristics.yaml
View File

@@ -188,7 +188,7 @@ rules:
filetype: mason filetype: mason
- lines: 50 - lines: 50
rules: 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 filetype: htmldjango
- pattern: '\bDTD\s+XHTML\s' - pattern: '\bDTD\s+XHTML\s'
filetype: xhtml filetype: xhtml

1
tests/extensions.vim
View File

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