fix(heex): self closing tag on same line

Author: leandrocp

src/nodes.rs

@@ -6,7 +6,7 @@ use std::convert::TryFrom;
 
 use crate::arena_tree;
 #[cfg(feature = "phoenix_heex")]
-pub use crate::parser::phoenix_heex::NodeHeexBlock;
+pub use crate::parser::phoenix_heex::{HeexNode, NodeHeexBlock};
 #[cfg(feature = "shortcodes")]
 pub use crate::parser::shortcodes::NodeShortCode;
 

src/parser/mod.rs

@@ -944,12 +944,28 @@ where
 
         let tag_name_len = scanners::phoenix_opening_tag(&line[self.first_nonspace..])?;
 
+        Some(tag_name_len)
+    }
+
+    #[cfg(feature = "phoenix_heex")]
+    fn is_heex_opening_self_closing_tag(&self, line: &str, expected_tag_name: &str) -> bool {
+        let Some(tag_name_len) = scanners::phoenix_opening_tag(&line[self.first_nonspace..]) else {
+            return false;
+        };
+
+        let line_tag_name = &line[self.first_nonspace + 1..=self.first_nonspace + tag_name_len];
+
+        if line_tag_name != expected_tag_name {
+            return false;
+        }
+
         let bytes = &line.as_bytes()[self.first_nonspace..];
-        if bytes.len() >= 2 && bytes[bytes.len() - 2] == b'/' && bytes[bytes.len() - 1] == b'>' {
-            return None;
+        let mut end = bytes.len();
+        while end > 0 && strings::is_line_end_char(bytes[end - 1]) {
+            end -= 1;
         }
 
-        Some(tag_name_len)
+        end >= 2 && bytes[end - 2] == b'/' && bytes[end - 1] == b'>'
     }
 
     #[cfg(feature = "phoenix_heex")]
@@ -1675,7 +1691,7 @@ where
                                     ..self.first_nonspace + 2 + closing_tag_name_len];
                                 closing_tag_name == tag_name
                             } else {
-                                false
+                                self.is_heex_opening_self_closing_tag(line, tag_name)
                             }
                         }
                         phoenix_heex::HeexNode::Directive => {

src/tests/phoenix_heex.rs

@@ -1603,6 +1603,24 @@ fn block_with_multiple_consecutive_empty_lines() {
     );
 }
 
+#[test]
+fn self_closing_followed_by_content() {
+    html_opts!(
+        [extension.phoenix_heex],
+        concat!("<.btn />\n", "\n", "After\n"),
+        concat!("<.btn />\n", "<p>After</p>\n"),
+    );
+}
+
+#[test]
+fn self_closing_component_followed_by_content() {
+    html_opts!(
+        [extension.phoenix_heex],
+        concat!("<Component.render />\n", "\n", "After\n"),
+        concat!("<Component.render />\n", "<p>After</p>\n"),
+    );
+}
+
 // ============================================================================
 // output formats
 // ============================================================================