Merge pull request #101 from Quantra/main

Support for closing tags starting with "end_" as well as "end".

Author: JaapJoris

djhtml/modes.py

@@ -241,7 +241,7 @@ def create_token(self, raw_token, src, line):
         return token, mode
 
     def _has_closing_token(self, name, raw_token, src):
-        if not re.search(f"{{%[-+]? *(end|/){name}(?: .*?|)%}}", src):
+        if not re.search(f"{{%[-+]? *(end_?|/){name}(?: .*?|)%}}", src):
             return False
         if regex := self.AMBIGUOUS_BLOCK_TAGS.get(name):
             if regex[0]:

tests/suite/django.html

@@ -184,3 +184,14 @@ <h1>Welcome, {{ request.user }}</h1>
         This component is intentionally repeated.
     {% /quote_text %}
 {% /quote %}
+
+
+<!-- Custom tag with end_ from issue #100 -->
+{% custom_tag %}
+    <div></div>
+{% end_custom_tag %}
+
+<!-- Custom tag -->
+{% customtag %}
+    <div></div>
+{% endcustomtag %}

tests/suite/django.tokens

@@ -184,4 +184,15 @@ Line([Text('    ', mode=DjHTML), Open('{% #quote_text %}', mode=DjTXT, level=1)]
 Line([Text('        This component is intentionally repeated.', mode=DjHTML)], level=2)
 Line([Text('    ', mode=DjHTML), Close('{% /quote_text %}', mode=DjTXT)], level=1)
 Line([Close('{% /quote %}', mode=DjTXT)])
+Line([])
+Line([])
+Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Custom tag with end_ from issue #100 ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
+Line([Open('{% custom_tag %}', mode=DjTXT)])
+Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML), Text('div', mode=InsideHTMLTag, absolute=5), Open('>', mode=DjHTML, level=1), Close('</div>', mode=DjHTML)], level=1)
+Line([Close('{% end_custom_tag %}', mode=DjTXT)])
+Line([])
+Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Custom tag ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
+Line([Open('{% customtag %}', mode=DjTXT)])
+Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML), Text('div', mode=InsideHTMLTag, absolute=5), Open('>', mode=DjHTML, level=1), Close('</div>', mode=DjHTML)], level=1)
+Line([Close('{% endcustomtag %}', mode=DjTXT)])
 Line([])