correctly associate branch children

Author: joshuadavidthomas

crates/djls-template-ast/src/parser.rs

@@ -177,16 +177,29 @@ impl Parser {
 
         let tag_spec = specs.get(tag_name.as_str()).cloned();
         let mut children = Vec::new();
+        let mut current_branch: Option<(String, Vec<String>, Vec<Node>)> = None;
 
         while !self.is_at_end() {
             match self.next_node() {
                 Ok(node) => {
-                    children.push(node);
+                    if let Some((_, _, branch_children)) = &mut current_branch {
+                        branch_children.push(node);
+                    } else {
+                        children.push(node);
+                    }
                 }
                 Err(ParserError::ErrorSignal(Signal::SpecialTag(tag))) => {
                     if let Some(spec) = &tag_spec {
                         // Check if closing tag
                         if Some(&tag) == spec.closing.as_ref() {
+                            // If we have a current branch, add it to children
+                            if let Some((name, bits, branch_children)) = current_branch {
+                                children.push(Node::Django(DjangoNode::Tag(TagNode::Branch {
+                                    name,
+                                    bits,
+                                    children: branch_children,
+                                })));
+                            }
                             children.push(Node::Django(DjangoNode::Tag(TagNode::Closing {
                                 name: tag,
                                 bits: vec![],
@@ -200,7 +213,15 @@ impl Parser {
                         // Check if intermediate tag
                         if let Some(intermediates) = &spec.intermediates {
                             if let Some(intermediate) = intermediates.iter().find(|i| i.name == tag) {
-                                // Create branch node with the current children
+                                // If we have a current branch, add it to children
+                                if let Some((name, bits, branch_children)) = current_branch {
+                                    children.push(Node::Django(DjangoNode::Tag(TagNode::Branch {
+                                        name,
+                                        bits,
+                                        children: branch_children,
+                                    })));
+                                }
+                                // Create new branch node
                                 let branch_bits = if intermediate.args {
                                     match &self.tokens[self.current - 1].token_type() {
                                         TokenType::DjangoBlock(content) => content
@@ -213,11 +234,7 @@ impl Parser {
                                 } else {
                                     vec![]
                                 };
-                                children.push(Node::Django(DjangoNode::Tag(TagNode::Branch {
-                                    name: tag,
-                                    bits: branch_bits,
-                                    children: Vec::new(),
-                                })));
+                                current_branch = Some((tag, branch_bits, Vec::new()));
                                 continue;
                             }
                         }
@@ -666,7 +683,8 @@ mod tests {
 
         #[test]
         fn test_parse_complex_if_elif() {
-            let source = "{% if x > 0 %}Positive{% elif x < 0 %}Negative{% else %}Zero{% endif %}";
+            let source =
+                "{% if x > 0 %}Positive{% elif x < 0 %}Negative{% else %}Zero{% endif %}";
             let tokens = Lexer::new(source).tokenize().unwrap();
             let mut parser = Parser::new(tokens);
             let ast = parser.parse().unwrap();

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap

@@ -22,15 +22,15 @@ nodes:
                       - x
                       - "<"
                       - "0"
-                    children: []
-            - Text: Negative
+                    children:
+                      - Text: Negative
             - Django:
                 Tag:
                   Branch:
                     name: else
                     bits: []
-                    children: []
-            - Text: Zero
+                    children:
+                      - Text: Zero
             - Django:
                 Tag:
                   Closing:

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap

@@ -23,8 +23,8 @@ nodes:
                   Branch:
                     name: empty
                     bits: []
-                    children: []
-            - Text: No items
+                    children:
+                      - Text: No items
             - Django:
                 Tag:
                   Closing:

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap

@@ -87,8 +87,8 @@ nodes:
                             Branch:
                               name: empty
                               bits: []
-                              children: []
-                      - Text: (no groups)
+                              children:
+                                - Text: (no groups)
                       - Django:
                           Tag:
                             Closing:
@@ -99,8 +99,8 @@ nodes:
                   Branch:
                     name: else
                     bits: []
-                    children: []
-            - Text: Guest
+                    children:
+                      - Text: Guest
             - Django:
                 Tag:
                   Closing:

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap

@@ -111,13 +111,13 @@ nodes:
                                                     Branch:
                                                       name: else
                                                       bits: []
-                                                      children: []
-                                              - Html:
-                                                  Element:
-                                                    tag_name: span
-                                                    attributes: {}
-                                                    children:
-                                                      - Text: User
+                                                      children:
+                                                        - Html:
+                                                            Element:
+                                                              tag_name: span
+                                                              attributes: {}
+                                                              children:
+                                                                - Text: User
                                               - Django:
                                                   Tag:
                                                     Closing: