Support Jinja multi-line comment syntax

Previously, `{# ... #}` comments were only recognized if they were opened
and closed on the same line. This commit allows them to span multiple lines.
As with the other comment tags, anything inside is ignored.

Thanks to @notpushkin for pointing this out!

Ref. #22

djhtml/modes.py

@@ -19,6 +19,7 @@ class DjTXT:
         r"\n",
         r"{%.*?%}",
         r"{#.*?#}",
+        r"{#",
     ]
 
     DJANGO_OPENING_AND_CLOSING_TAGS = [
@@ -151,7 +152,6 @@ def create_token(self, raw_token, src):
         token = Token.Text(raw_token)
 
         tag = re.match(r"{% *(\w+).*?%}", raw_token)
-        comment = None if tag else re.match(r"{# *(\w+:\w+).*?#}", raw_token)
         if tag:
             name = tag.group(1)
             if name == "comment":
@@ -163,12 +163,17 @@ def create_token(self, raw_token, src):
                 token = Token.OpenAndClose(raw_token, kind)
             elif name.startswith("end"):
                 token = Token.Close(raw_token, kind)
+            return token
 
-        elif comment:
-            name = comment.group(1)
-            if name == "fmt:off":
-                token = Token.Open(raw_token, kind)
-                self.next_mode = Comment(r"\{# *fmt:on.*?#\}", self, kind)
+        comment = re.match(r"{# *(\w+:\w+).*?#}", raw_token)
+        if comment and comment[1] == "fmt:off":
+            token = Token.Open(raw_token, kind)
+            self.next_mode = Comment(r"\{# *fmt:on.*?#\}", self, kind)
+            return token
+
+        if raw_token == "{#":
+            token = Token.Open(raw_token, kind)
+            self.next_mode = Comment(r"#\}", self, kind)
 
         return token
 

tests/suite/django.in

@@ -96,3 +96,11 @@ There are {{ count }} items.
 <a{% if %} class=""{% endif %}>
 Click here!
 </a>
+
+
+<!-- Multiline Jinja comment -->
+{#
+      ,-._|\
+     /     .\
+     \_,--._/
+#}

tests/suite/django.out

@@ -96,3 +96,11 @@
 <a{% if %} class=""{% endif %}>
     Click here!
 </a>
+
+
+<!-- Multiline Jinja comment -->
+{#
+      ,-._|\
+     /     .\
+     \_,--._/
+#}