Fix end location of self-closing elements

Author: berendkleinhaneveld

collagraph/sfc/parser.py

@@ -45,7 +45,7 @@ def __init__(self, *args, **kwargs):
         self.root = Element("root", attrs={}, location=(-1, -1))
         self.stack = [self.root]
 
-    def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]):
+    def _handle_tag(self, tag: str, attrs: list[tuple[str, str | None]]) -> Element:
         # The tag parameter is lower-cased by the HTMLParser.
         # In order to figure out whether the tag indicates
         # an imported class, we need the original casing for
@@ -68,6 +68,11 @@ def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]):
         parent = self.stack[-1]
         parent.children.append(node)
         node.parent = ref(parent)
+
+        return node
+
+    def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]):
+        node = self._handle_tag(tag, attrs)
         # Make the new node the last on the stack
         self.stack.append(node)
 
@@ -81,6 +86,20 @@ def handle_endtag(self, tag: str):
             if node.tag.lower() == tag:
                 break
 
+    def handle_startendtag(self, tag: str, attrs):
+        """Handle self-closing tags"""
+        node = self._handle_tag(tag, attrs)
+        # Get the full text and split it
+        text = self.get_starttag_text()
+        lines = text.splitlines()
+        # Find the location of where the tag is actually closed
+        column = lines[-1].index("/>")
+        # Figure out how many lines the tag spans
+        line_span_count = len(lines) - 1
+        line, _ = self.getpos()
+        # Set the end to be exactly where the '/>' is located
+        node.end = (line + line_span_count, column)
+
     def handle_data(self, data: str):
         if data.strip():
             # Add item as child to the last on the stack

tests/test_parser.py

@@ -1,7 +1,10 @@
+from textwrap import dedent
+
 import pytest
 
 from collagraph import Collagraph, EventLoopType
 from collagraph.renderers import DictRenderer
+from collagraph.sfc.parser import CGXParser
 
 
 def test_parser_unclosed_element(parse_source):
@@ -49,3 +52,28 @@ class App(cg.Component):
             </script>
             """
         )
+
+
+def test_parser_element_start_end(parse_source):
+    parser = CGXParser()
+    parser.feed(
+        dedent("""\
+            <long-item
+              @with-many="toet"
+              :attrs="blaat"
+              :that-take="foo"
+              a-lot-of="space"
+            />
+
+            <other />
+        """)
+    )
+
+    assert parser.root
+    long_item = parser.root.children[0]
+    assert long_item.location == (1, 0)
+    assert long_item.end == (6, 0)
+
+    short_item = parser.root.children[1]
+    assert short_item.location == (8, 0)
+    assert short_item.end == (8, 7)