From 3a953da16ccde04759cfc7b6a228a0d60e8c9b32 Mon Sep 17 00:00:00 2001 From: Thyrum Date: Sat, 17 Jul 2021 17:42:25 +0200 Subject: [PATCH 1/2] Fix tag recognition when starting/ending with - As can be found on https://www.webforefront.com/django/usebuiltinjinjastatements.html jinja tags can actually start and end with a `-` after resp. before the `%` sign. This has been added to the regex. --- indent/jinja.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indent/jinja.vim b/indent/jinja.vim index 25e8f66..1d49dd0 100644 --- a/indent/jinja.vim +++ b/indent/jinja.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Jinja HTML template " Maintainer: Evan Hammer -" Last Change: 2013 Jan 26 +" Last Change: 2021 Jul 17 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -50,8 +50,8 @@ function! GetDjangoIndent(...) let pnb = getline(lnum) let cur = getline(v:lnum) - let tagstart = '.*' . '{%\s*' - let tagend = '.*%}' . '.*' + let tagstart = '.*' . '{%-\?\s*' + let tagend = '.*-\?%}' . '.*' let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\)' let midtags = '\(empty\|else\|elif\)' From eb6a5910ce835540acf213df3f032ac8c5383728 Mon Sep 17 00:00:00 2001 From: Thyrum Date: Sat, 17 Jul 2021 17:45:52 +0200 Subject: [PATCH 2/2] Add macro to the blocktags --- indent/jinja.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indent/jinja.vim b/indent/jinja.vim index 1d49dd0..03fd657 100644 --- a/indent/jinja.vim +++ b/indent/jinja.vim @@ -53,7 +53,7 @@ function! GetDjangoIndent(...) let tagstart = '.*' . '{%-\?\s*' 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 pnb_blockstart = pnb =~# tagstart . blocktags . tagend