More testcases for spaces in Django template tags

rtts · May 16, 2021 · 1a190bd · 1a190bd
1 parent 30f2e51
commit 1a190bd
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/djhtml/modes.py b/djhtml/modes.py
@@ -19,7 +19,7 @@ class Mode:
     """
 
     TAG = r"\{%.*?%\}"
-    COMMENT = r"{% comment .*? endcomment %}"
+    COMMENT = r"{% *comment.*?endcomment *%}"
     TOKEN = re.compile(f"(?s)({COMMENT})|({TAG})")
 
     DJANGO_OPENING_TAGS = [
@@ -55,6 +55,8 @@ class Mode:
     ]
 
     def __init__(self, source):
+        if "\t" in source:
+            raise SyntaxError("This file contains TAB characters.")
         self.source = source
 
     def indent(self, tabwidth, level=0):
@@ -132,7 +134,7 @@ def get_token_type(self, raw_token):
         Given the raw token string, determine what type it is.
 
         """
-        if raw_token.startswith("{% comment"):
+        if re.match(r"{% *comment", raw_token):
             return Comment
         if raw_token.startswith("{%"):
             if tag_name := re.search(r"(\w+)", raw_token):

diff --git a/test.html b/test.html
@@ -0,0 +1 @@
+	hoi
diff --git a/tests/suite/django.in b/tests/suite/django.in
@@ -55,3 +55,30 @@ console.log("Hi mom!");
        jrei                  `-  |        `::_;   `\ `' /
                                                     `--'
 {% endcomment %}
+
+
+<!-- Django comment with optional comment -->
+{% comment "Yo dawg" %}
+            I heard you like comments
+{% endcomment %}
+
+
+<!-- Various spacings -->
+{%comment    %}
+             %}
+{%    endcomment%}
+{%if%}
+{%block content    %}
+Yuck!
+{%    endblock%}
+{%    endif    %}
+
+
+<!-- Inconsistent nesting -->
+{% block %}
+1
+{% with %}
+2
+{% endblock %}
+1
+{% endwith %}
diff --git a/tests/suite/django.out b/tests/suite/django.out
@@ -55,3 +55,30 @@
        jrei                  `-  |        `::_;   `\ `' /
                                                     `--'
 {% endcomment %}
+
+
+<!-- Django comment with optional comment -->
+{% comment "Yo dawg" %}
+            I heard you like comments
+{% endcomment %}
+
+
+<!-- Various spacings -->
+{%comment    %}
+             %}
+{%    endcomment%}
+{%if%}
+    {%block content    %}
+        Yuck!
+    {%    endblock%}
+{%    endif    %}
+
+
+<!-- Inconsistent nesting -->
+{% block %}
+    1
+    {% with %}
+        2
+    {% endblock %}
+    1
+{% endwith %}