From cff16401fa5bbc21d6782280061b01d50c4c8fdc Mon Sep 17 00:00:00 2001
From: Jaap Joris Vens <jj@rtts.eu>
Date: Fri, 24 Feb 2023 00:25:59 +0100
Subject: [PATCH 1/3] Relative multi-line HTML elements

Reintroduces "relative multi-line" indentation to DjHTML:

    <long-html-tag
        attribute1="value"
        attribute2="value"
        attribute3="value"/>

However, this only happens when the tag name is followed by a newline.
Otherwise, "absolute multi-line" indentation will be used:

    <long-html-tag attribute1="value"
                   attribute2="value"
                   attribute3="value"/>

This is a good rule, but also the last rule I'm willing to add regarding
multi-line indentation. Our users deserve a stable set of indentation
principles, and this is it. No more bikeshedding.
---
 djhtml/modes.py         | 29 +++++++++-----
 tests/suite/html.html   | 63 +++++++++++++++++-------------
 tests/suite/html.tokens | 85 +++++++++++++++++++++++------------------
 3 files changed, 105 insertions(+), 72 deletions(-)

diff --git a/djhtml/modes.py b/djhtml/modes.py
index 358618d..6f64179 100644
--- a/djhtml/modes.py
+++ b/djhtml/modes.py
@@ -287,9 +287,19 @@ def create_token(self, raw_token, src, line):
 
         if raw_token == "<":
             if tag := re.match(r"([\w\-\.:]+)", src):
-                token, mode = Token.Text(raw_token, mode=DjHTML), InsideHTMLTag(
-                    tag[1], line, self
+                tagname = tag[1]
+                absolute = True
+                token = Token.Text(raw_token, mode=DjHTML)
+                offsets = dict(
+                    relative=-1 if line.indents else 0,
+                    absolute=len(line) + len(tagname) + 2,
                 )
+                if tag := re.match(tagname + r"[ \t]*\n", src):
+                    # Use "relative" multi-line indendation instead
+                    absolute = False
+                    token.indents = True
+                    offsets = dict(relative=0, absolute=0)
+                mode = InsideHTMLTag(tagname, line, self, absolute, offsets)
             else:
                 token = Token.Text(raw_token, mode=DjHTML)
         elif raw_token == "<!--":
@@ -513,17 +523,14 @@ class InsideHTMLTag(DjTXT):
 
     RAW_TOKENS = DjTXT.RAW_TOKENS + [r"/?>", r"[^ ='\">/\n]+=", r'"', r"'"]
 
-    def __init__(self, tagname, line, return_mode):
+    def __init__(self, tagname, line, return_mode, absolute, offsets):
         self.tagname = tagname
         self.return_mode = return_mode
+        self.absolute = absolute
+        self.offsets = offsets
         self.token_re = compile_re(self.RAW_TOKENS)
         self.inside_attr = False
-        self.offsets = dict(
-            relative=-1 if line.indents else 0, absolute=len(line) + len(tagname) + 2
-        )
-
-        # Pff...
-        self.additional_offset = -len(tagname) - 1
+        self.additional_offset = -len(tagname) - 1 if absolute else 0
 
     def create_token(self, raw_token, src, line):
         mode = self
@@ -549,6 +556,8 @@ def create_token(self, raw_token, src, line):
                 token = Token.Text(raw_token, mode=InsideHTMLTag, **self.offsets)
         elif not self.inside_attr and raw_token == "/>":
             token, mode = Token.Text(raw_token, mode=DjHTML), self.return_mode
+            if not self.absolute:
+                token.dedents = True
         elif not self.inside_attr and raw_token == ">":
             if self.tagname.lower() in DjHTML.IGNORE_TAGS:
                 token, mode = Token.Text(raw_token, mode=DjHTML), self.return_mode
@@ -565,6 +574,8 @@ def create_token(self, raw_token, src, line):
                     Token.Open(raw_token, mode=DjHTML),
                     self.return_mode,
                 )
+            if not self.absolute:
+                token.dedents = True
         else:
             token, mode = super().create_token(raw_token, src, line)
 
diff --git a/tests/suite/html.html b/tests/suite/html.html
index 9c355e0..b4b38f0 100644
--- a/tests/suite/html.html
+++ b/tests/suite/html.html
@@ -132,18 +132,18 @@ <h1>Title</h1>
 <!-- SVG with multi-line attribute values -->
 <svg width="325" height="325" xmlns="http://www.w3.org/2000/svg">
     <path
-          d="M 80 80
-             A 45 45, 0, 0, 0, 125 125
-             L 125 80 Z"
-          fill="green"
+        d="M 80 80
+           A 45 45, 0, 0, 0, 125 125
+           L 125 80 Z"
+        fill="green"
     />
     <path
-          d="
-             M 80 80
-             A 45 45, 0, 0, 0, 125 125
-             L 125 80 Z
-            "
-          fill="green"
+        d="
+           M 80 80
+           A 45 45, 0, 0, 0, 125 125
+           L 125 80 Z
+          "
+        fill="green"
     />
     <path d="M 80 80
              A 45 45, 0, 0, 0, 125 125
@@ -161,20 +161,20 @@ <h1>Title</h1>
 
 <!-- Block tags inside HTML elements -->
 <div
-     {% block class %}
-         class="foo"
-     {% endblock %}
+    {% block class %}
+        class="foo"
+    {% endblock %}
 >
     text
 </div>
 
 <div
-     {% block classes %}
-         class="
-                foo
-                bar
-               "
-     {% endblock %}
+    {% block classes %}
+        class="
+               foo
+               bar
+              "
+    {% endblock %}
 >
     text
 </div>
@@ -227,8 +227,8 @@ <h1>Title</h1>
     text
 </a>
 <a
-   id="2" href=""
-   class="button">
+    id="2" href=""
+    class="button">
     text
 </a>
 <a id="3" href=""
@@ -237,8 +237,8 @@ <h1>Title</h1>
     text
 </a>
 <a
-   id="4" href=""
-   class="button"
+    id="4" href=""
+    class="button"
 >
     text
 </a>
@@ -306,11 +306,11 @@ <h1>Title</h1>
 
 <!-- Weird but legal element names -->
 <my-component
-              hidden/>
+    hidden/>
 <my.component
-              hidden/>
+    hidden/>
 <my:component
-              hidden/>
+    hidden/>
 
 
 <!-- Multi-line attribute value with additional elements/attributes -->
@@ -352,3 +352,14 @@ <h1>Title</h1>
             class="baz'
                   "
 />
+
+
+<!-- Absolute vs. relative mult-line elements -->
+<long-html-tag attribute1="value"
+               attribute2="value"
+               attribute3="value"/>
+
+<long-html-tag-followed-by-newline
+    attribute1="value"
+    attribute2="value"
+    attribute3="value"/>
diff --git a/tests/suite/html.tokens b/tests/suite/html.tokens
index e66c65f..06b5333 100644
--- a/tests/suite/html.tokens
+++ b/tests/suite/html.tokens
@@ -131,20 +131,20 @@ Line([])
 Line([])
 Line([Open('<!--', mode=DjHTML, ignore=True), Text(' SVG with multi-line attribute values ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
 Line([Text('<', mode=DjHTML), Text('svg ', mode=InsideHTMLTag, absolute=5), Text('width=', mode=InsideHTMLTag, absolute=5), Text('"', mode=InsideHTMLTag, absolute=12), Text('325', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11), Text(' ', mode=InsideHTMLTag, absolute=5), Text('height=', mode=InsideHTMLTag, absolute=5), Text('"', mode=InsideHTMLTag, absolute=25), Text('325', mode=InsideHTMLTag, absolute=25), Text('"', mode=InsideHTMLTag, absolute=24), Text(' ', mode=InsideHTMLTag, absolute=5), Text('xmlns=', mode=InsideHTMLTag, absolute=5), Text('"', mode=InsideHTMLTag, absolute=37), Text('http://www.w3.org/2000/svg', mode=InsideHTMLTag, absolute=37), Text('"', mode=InsideHTMLTag, absolute=36), Open('>', mode=DjHTML)])
-Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML), Text('path', mode=InsideHTMLTag, absolute=6)], level=1)
-Line([Text('          ', mode=InsideHTMLTag, absolute=6), Text('d=', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=9), Text('M 80 80', mode=InsideHTMLTag, absolute=9)], level=1, offset=6)
-Line([Text('             A 45 45, 0, 0, 0, 125 125', mode=InsideHTMLTag, absolute=9)], level=1, offset=9)
-Line([Text('             L 125 80 Z', mode=InsideHTMLTag, absolute=9), Text('"', mode=InsideHTMLTag, absolute=8)], level=1, offset=9)
-Line([Text('          ', mode=InsideHTMLTag, absolute=6), Text('fill=', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=12), Text('green', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11)], level=1, offset=6)
-Line([Text('    ', mode=InsideHTMLTag, absolute=6), Text('/>', mode=DjHTML)], level=1)
-Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML), Text('path', mode=InsideHTMLTag, absolute=6)], level=1)
-Line([Text('          ', mode=InsideHTMLTag, absolute=6), Text('d=', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=9)], level=1, offset=6)
-Line([Text('             M 80 80', mode=InsideHTMLTag, absolute=9)], level=1, offset=9)
-Line([Text('             A 45 45, 0, 0, 0, 125 125', mode=InsideHTMLTag, absolute=9)], level=1, offset=9)
-Line([Text('             L 125 80 Z', mode=InsideHTMLTag, absolute=9)], level=1, offset=9)
-Line([Text('            ', mode=InsideHTMLTag, absolute=9), Text('"', mode=InsideHTMLTag, absolute=8)], level=1, offset=8)
-Line([Text('          ', mode=InsideHTMLTag, absolute=6), Text('fill=', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=12), Text('green', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11)], level=1, offset=6)
-Line([Text('    ', mode=InsideHTMLTag, absolute=6), Text('/>', mode=DjHTML)], level=1)
+Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML, level=1), Text('path', mode=InsideHTMLTag)], level=1)
+Line([Text('        ', mode=InsideHTMLTag), Text('d=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=3), Text('M 80 80', mode=InsideHTMLTag, absolute=3)], level=2)
+Line([Text('           A 45 45, 0, 0, 0, 125 125', mode=InsideHTMLTag, absolute=3)], level=2, offset=3)
+Line([Text('           L 125 80 Z', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=2)], level=2, offset=3)
+Line([Text('        ', mode=InsideHTMLTag), Text('fill=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=6), Text('green', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=5)], level=2)
+Line([Text('    ', mode=InsideHTMLTag), Text('/>', mode=DjHTML)], level=1)
+Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML, level=1), Text('path', mode=InsideHTMLTag)], level=1)
+Line([Text('        ', mode=InsideHTMLTag), Text('d=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=3)], level=2)
+Line([Text('           M 80 80', mode=InsideHTMLTag, absolute=3)], level=2, offset=3)
+Line([Text('           A 45 45, 0, 0, 0, 125 125', mode=InsideHTMLTag, absolute=3)], level=2, offset=3)
+Line([Text('           L 125 80 Z', mode=InsideHTMLTag, absolute=3)], level=2, offset=3)
+Line([Text('          ', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=2)], level=2, offset=2)
+Line([Text('        ', mode=InsideHTMLTag), Text('fill=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=6), Text('green', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=5)], level=2)
+Line([Text('    ', mode=InsideHTMLTag), Text('/>', mode=DjHTML)], level=1)
 Line([Text('    ', mode=DjHTML), Text('<', mode=DjHTML), Text('path ', mode=InsideHTMLTag, absolute=6), Text('d=', mode=InsideHTMLTag, absolute=6), Text('"', mode=InsideHTMLTag, absolute=9), Text('M 80 80', mode=InsideHTMLTag, absolute=9)], level=1)
 Line([Text('             A 45 45, 0, 0, 0, 125 125', mode=InsideHTMLTag, absolute=9)], level=1, offset=9)
 Line([Text('             L 125 80 Z', mode=InsideHTMLTag, absolute=9), Text('"', mode=InsideHTMLTag, absolute=8)], level=1, offset=9)
@@ -160,21 +160,21 @@ Line([Close('</div>', mode=DjHTML)])
 Line([])
 Line([])
 Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Block tags inside HTML elements ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
-Line([Text('<', mode=DjHTML), Text('div', mode=InsideHTMLTag, absolute=5)])
-Line([Text('     ', mode=InsideHTMLTag, absolute=5), Open('{% block class %}', mode=DjTXT, absolute=5)], offset=5)
-Line([Text('         ', mode=InsideHTMLTag, absolute=5), Text('class=', mode=InsideHTMLTag, absolute=5), Text('"', mode=InsideHTMLTag, absolute=12), Text('foo', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11)], level=1, offset=5)
-Line([Text('     ', mode=InsideHTMLTag, absolute=5), Close('{% endblock %}', mode=DjTXT, absolute=5)], offset=5)
+Line([Text('<', mode=DjHTML), Text('div', mode=InsideHTMLTag)])
+Line([Text('    ', mode=InsideHTMLTag), Open('{% block class %}', mode=DjTXT, level=1)], level=1)
+Line([Text('        ', mode=InsideHTMLTag), Text('class=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=7), Text('foo', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6)], level=2)
+Line([Text('    ', mode=InsideHTMLTag), Close('{% endblock %}', mode=DjTXT)], level=1)
 Line([Open('>', mode=DjHTML)])
 Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</div>', mode=DjHTML)])
 Line([])
-Line([Text('<', mode=DjHTML), Text('div', mode=InsideHTMLTag, absolute=5)])
-Line([Text('     ', mode=InsideHTMLTag, absolute=5), Open('{% block classes %}', mode=DjTXT, absolute=5)], offset=5)
-Line([Text('         ', mode=InsideHTMLTag, absolute=5), Text('class=', mode=InsideHTMLTag, absolute=5), Text('"', mode=InsideHTMLTag, absolute=12)], level=1, offset=5)
-Line([Text('                foo', mode=InsideHTMLTag, absolute=12)], level=1, offset=12)
-Line([Text('                bar', mode=InsideHTMLTag, absolute=12)], level=1, offset=12)
-Line([Text('               ', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11)], level=1, offset=11)
-Line([Text('     ', mode=InsideHTMLTag, absolute=5), Close('{% endblock %}', mode=DjTXT, absolute=5)], offset=5)
+Line([Text('<', mode=DjHTML), Text('div', mode=InsideHTMLTag)])
+Line([Text('    ', mode=InsideHTMLTag), Open('{% block classes %}', mode=DjTXT, level=1)], level=1)
+Line([Text('        ', mode=InsideHTMLTag), Text('class=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=7)], level=2)
+Line([Text('               foo', mode=InsideHTMLTag, absolute=7)], level=2, offset=7)
+Line([Text('               bar', mode=InsideHTMLTag, absolute=7)], level=2, offset=7)
+Line([Text('              ', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6)], level=2, offset=6)
+Line([Text('    ', mode=InsideHTMLTag), Close('{% endblock %}', mode=DjTXT)], level=1)
 Line([Open('>', mode=DjHTML)])
 Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</div>', mode=DjHTML)])
@@ -226,9 +226,9 @@ Line([Text('<', mode=DjHTML), Text('a ', mode=InsideHTMLTag, absolute=3), Text('
 Line([Text('   ', mode=InsideHTMLTag, absolute=3), Text('class=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=10), Text('button', mode=InsideHTMLTag, absolute=10), Text('"', mode=InsideHTMLTag, absolute=9), Open('>', mode=DjHTML)], offset=3)
 Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</a>', mode=DjHTML)])
-Line([Text('<', mode=DjHTML), Text('a', mode=InsideHTMLTag, absolute=3)])
-Line([Text('   ', mode=InsideHTMLTag, absolute=3), Text('id=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=7), Text('2', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6), Text(' ', mode=InsideHTMLTag, absolute=3), Text('href=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=16), Text('"', mode=InsideHTMLTag, absolute=15)], offset=3)
-Line([Text('   ', mode=InsideHTMLTag, absolute=3), Text('class=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=10), Text('button', mode=InsideHTMLTag, absolute=10), Text('"', mode=InsideHTMLTag, absolute=9), Open('>', mode=DjHTML)], offset=3)
+Line([Text('<', mode=DjHTML), Text('a', mode=InsideHTMLTag)])
+Line([Text('    ', mode=InsideHTMLTag), Text('id=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=4), Text('2', mode=InsideHTMLTag, absolute=4), Text('"', mode=InsideHTMLTag, absolute=3), Text(' ', mode=InsideHTMLTag), Text('href=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=13), Text('"', mode=InsideHTMLTag, absolute=12)], level=1)
+Line([Text('    ', mode=InsideHTMLTag), Text('class=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=7), Text('button', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6), Open('>', mode=DjHTML)], level=1)
 Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</a>', mode=DjHTML)])
 Line([Text('<', mode=DjHTML), Text('a ', mode=InsideHTMLTag, absolute=3), Text('id=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=7), Text('3', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6), Text(' ', mode=InsideHTMLTag, absolute=3), Text('href=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=16), Text('"', mode=InsideHTMLTag, absolute=15)])
@@ -236,9 +236,9 @@ Line([Text('   ', mode=InsideHTMLTag, absolute=3), Text('class=', mode=InsideHTM
 Line([Open('>', mode=DjHTML)])
 Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</a>', mode=DjHTML)])
-Line([Text('<', mode=DjHTML), Text('a', mode=InsideHTMLTag, absolute=3)])
-Line([Text('   ', mode=InsideHTMLTag, absolute=3), Text('id=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=7), Text('4', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6), Text(' ', mode=InsideHTMLTag, absolute=3), Text('href=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=16), Text('"', mode=InsideHTMLTag, absolute=15)], offset=3)
-Line([Text('   ', mode=InsideHTMLTag, absolute=3), Text('class=', mode=InsideHTMLTag, absolute=3), Text('"', mode=InsideHTMLTag, absolute=10), Text('button', mode=InsideHTMLTag, absolute=10), Text('"', mode=InsideHTMLTag, absolute=9)], offset=3)
+Line([Text('<', mode=DjHTML), Text('a', mode=InsideHTMLTag)])
+Line([Text('    ', mode=InsideHTMLTag), Text('id=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=4), Text('4', mode=InsideHTMLTag, absolute=4), Text('"', mode=InsideHTMLTag, absolute=3), Text(' ', mode=InsideHTMLTag), Text('href=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=13), Text('"', mode=InsideHTMLTag, absolute=12)], level=1)
+Line([Text('    ', mode=InsideHTMLTag), Text('class=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=7), Text('button', mode=InsideHTMLTag, absolute=7), Text('"', mode=InsideHTMLTag, absolute=6)], level=1)
 Line([Open('>', mode=DjHTML)])
 Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</a>', mode=DjHTML)])
@@ -305,12 +305,12 @@ Line([Text('    text', mode=DjHTML)], level=1)
 Line([Close('</div>', mode=DjHTML)])
 Line([])
 Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Weird but legal element names ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
-Line([Text('<', mode=DjHTML), Text('my-component', mode=InsideHTMLTag, absolute=14)])
-Line([Text('              hidden', mode=InsideHTMLTag, absolute=14), Text('/>', mode=DjHTML)], offset=14)
-Line([Text('<', mode=DjHTML), Text('my.component', mode=InsideHTMLTag, absolute=14)])
-Line([Text('              hidden', mode=InsideHTMLTag, absolute=14), Text('/>', mode=DjHTML)], offset=14)
-Line([Text('<', mode=DjHTML), Text('my:component', mode=InsideHTMLTag, absolute=14)])
-Line([Text('              hidden', mode=InsideHTMLTag, absolute=14), Text('/>', mode=DjHTML)], offset=14)
+Line([Text('<', mode=DjHTML), Text('my-component', mode=InsideHTMLTag)])
+Line([Text('    hidden', mode=InsideHTMLTag), Text('/>', mode=DjHTML)], level=1)
+Line([Text('<', mode=DjHTML), Text('my.component', mode=InsideHTMLTag)])
+Line([Text('    hidden', mode=InsideHTMLTag), Text('/>', mode=DjHTML)], level=1)
+Line([Text('<', mode=DjHTML), Text('my:component', mode=InsideHTMLTag)])
+Line([Text('    hidden', mode=InsideHTMLTag), Text('/>', mode=DjHTML)], level=1)
 Line([])
 Line([])
 Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Multi-line attribute value with additional elements/attributes ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
@@ -352,4 +352,15 @@ Line([Text('                  ', mode=InsideHTMLTag, absolute=19), Text("'", mod
 Line([Text('            ', mode=InsideHTMLTag, absolute=12), Text('class=', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=19), Text('baz', mode=InsideHTMLTag, absolute=19), Text("'", mode=InsideHTMLTag, absolute=19)], offset=12)
 Line([Text('                  ', mode=InsideHTMLTag, absolute=19), Text('"', mode=InsideHTMLTag, absolute=18)], offset=18)
 Line([Text('/>', mode=DjHTML)])
+Line([])
+Line([])
+Line([Open('<!--', mode=DjHTML, ignore=True), Text(' Absolute vs. relative mult-line elements ', mode=Comment, ignore=True), Close('-->', mode=DjHTML, ignore=True)], ignore=True)
+Line([Text('<', mode=DjHTML), Text('long-html-tag ', mode=InsideHTMLTag, absolute=15), Text('attribute1=', mode=InsideHTMLTag, absolute=15), Text('"', mode=InsideHTMLTag, absolute=27), Text('value', mode=InsideHTMLTag, absolute=27), Text('"', mode=InsideHTMLTag, absolute=26)])
+Line([Text('               ', mode=InsideHTMLTag, absolute=15), Text('attribute2=', mode=InsideHTMLTag, absolute=15), Text('"', mode=InsideHTMLTag, absolute=27), Text('value', mode=InsideHTMLTag, absolute=27), Text('"', mode=InsideHTMLTag, absolute=26)], offset=15)
+Line([Text('               ', mode=InsideHTMLTag, absolute=15), Text('attribute3=', mode=InsideHTMLTag, absolute=15), Text('"', mode=InsideHTMLTag, absolute=27), Text('value', mode=InsideHTMLTag, absolute=27), Text('"', mode=InsideHTMLTag, absolute=26), Text('/>', mode=DjHTML)], offset=15)
+Line([])
+Line([Text('<', mode=DjHTML), Text('long-html-tag-followed-by-newline', mode=InsideHTMLTag)])
+Line([Text('    ', mode=InsideHTMLTag), Text('attribute1=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=12), Text('value', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11)], level=1)
+Line([Text('    ', mode=InsideHTMLTag), Text('attribute2=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=12), Text('value', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11)], level=1)
+Line([Text('    ', mode=InsideHTMLTag), Text('attribute3=', mode=InsideHTMLTag), Text('"', mode=InsideHTMLTag, absolute=12), Text('value', mode=InsideHTMLTag, absolute=12), Text('"', mode=InsideHTMLTag, absolute=11), Text('/>', mode=DjHTML)], level=1)
 Line([])
\ No newline at end of file

From bc8523cf8a229227ded0dc261bd5f1b556cf94af Mon Sep 17 00:00:00 2001
From: Jaap Joris Vens <jj@rtts.eu>
Date: Fri, 24 Feb 2023 08:31:33 +0100
Subject: [PATCH 2/3] Address reviewer comments

---
 djhtml/modes.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/djhtml/modes.py b/djhtml/modes.py
index 6f64179..d512680 100644
--- a/djhtml/modes.py
+++ b/djhtml/modes.py
@@ -286,15 +286,16 @@ def create_token(self, raw_token, src, line):
         mode = self
 
         if raw_token == "<":
-            if tag := re.match(r"([\w\-\.:]+)", src):
-                tagname = tag[1]
+            if match := re.match(r"([\w\-\.:]+)(\s*)", src):
+                tagname = match[1]
+                following_spaces = match[2]
                 absolute = True
                 token = Token.Text(raw_token, mode=DjHTML)
                 offsets = dict(
                     relative=-1 if line.indents else 0,
                     absolute=len(line) + len(tagname) + 2,
                 )
-                if tag := re.match(tagname + r"[ \t]*\n", src):
+                if "\n" in following_spaces:
                     # Use "relative" multi-line indendation instead
                     absolute = False
                     token.indents = True

From 804a5438f60f3b48ffc71e8281d186bc7997f9e2 Mon Sep 17 00:00:00 2001
From: Jaap Joris Vens <jj@rtts.eu>
Date: Fri, 24 Feb 2023 08:32:14 +0100
Subject: [PATCH 3/3] Bump version number

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 8a32a85..3258233 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = djhtml
-version = 3.0.1
+version = 3.0.2
 description = Django/Jinja template indenter
 long_description = file: README.md
 long_description_content_type = text/markdown