Merge pull request #16 from Thyrum/master

Add `-` support to tags and add `macro` tag
This commit is contained in:
Hsiaoming Yang
2021-07-19 13:13:03 +09:00
committed by GitHub

View File

@@ -1,7 +1,7 @@
" Vim indent file " Vim indent file
" Language: Jinja HTML template " Language: Jinja HTML template
" Maintainer: Evan Hammer <evan@evanhammer.com> " Maintainer: Evan Hammer <evan@evanhammer.com>
" Last Change: 2013 Jan 26 " Last Change: 2021 Jul 17
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists("b:did_indent") if exists("b:did_indent")
@@ -50,10 +50,10 @@ function! GetDjangoIndent(...)
let pnb = getline(lnum) let pnb = getline(lnum)
let cur = getline(v:lnum) let cur = getline(v:lnum)
let tagstart = '.*' . '{%\s*' let tagstart = '.*' . '{%-\?\s*'
let tagend = '.*%}' . '.*' let tagend = '.*-\?%}' . '.*'
let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\)' let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\|macro\)'
let midtags = '\(empty\|else\|elif\)' let midtags = '\(empty\|else\|elif\)'
let pnb_blockstart = pnb =~# tagstart . blocktags . tagend let pnb_blockstart = pnb =~# tagstart . blocktags . tagend