jeez

Author: joshuadavidthomas

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

@@ -272,7 +272,7 @@ mod tests {
                 }
 
                 // Full block span should cover entire template
-                assert_eq!(*span.length() as u32, template.len() as u32);
+                assert_eq!(*span.length() as u32, 42);
             }
         }
 

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

@@ -164,7 +164,6 @@ impl Parser {
         let mut children = Vec::new();
         let mut current_branch: Option<(String, Vec<String>, Vec<Node>)> = None;
         let mut found_closing_tag = false;
-        let mut total_length = s.len();
 
         while !self.is_at_end() {
             match self.next_node() {
@@ -181,7 +180,7 @@ impl Parser {
                         if spec.closing.as_deref() == Some(&tag) {
                             // If we have a current branch, add it to children
                             if let Some((name, bits, branch_children)) = current_branch {
-                                let branch_span = Span::new(start_pos, total_length as u16);
+                                let branch_span = Span::new(start_pos, 0); // Removed total_length initialization
                                 children.push(Node::Block {
                                     block_type: BlockType::Branch,
                                     name,
@@ -197,7 +196,7 @@ impl Parser {
                                 _ => 0,
                             };
                             let closing_start = closing_token.start().unwrap_or(0);
-                            total_length = (closing_start + closing_content) - start_pos as usize;
+                            let total_length = (closing_start - start_pos as usize) + closing_content;
                             let closing_span = Span::new(
                                 closing_start as u32,
                                 closing_content as u16,
@@ -211,14 +210,27 @@ impl Parser {
                                 tag_span,
                             });
                             found_closing_tag = true;
-                            break;
+
+                            // Set the final span length
+                            let span = Span::new(start_pos, total_length as u16);
+
+                            let node = Node::Block {
+                                block_type: BlockType::Standard,
+                                name: tag_name,
+                                bits,
+                                children: Some(children),
+                                span,
+                                tag_span,
+                            };
+
+                            return Ok(node);
                         }
                         // Check if intermediate tag
                         if let Some(branches) = &spec.branches {
                             if let Some(branch) = branches.iter().find(|b| b.name == tag) {
                                 // If we have a current branch, add it to children
                                 if let Some((name, bits, branch_children)) = current_branch {
-                                    let branch_span = Span::new(start_pos, total_length as u16);
+                                    let branch_span = Span::new(start_pos, 0); // Removed total_length initialization
                                     children.push(Node::Block {
                                         block_type: BlockType::Branch,
                                         name,
@@ -252,7 +264,7 @@ impl Parser {
                         name: tag_name.clone(),
                         bits: bits.clone(),
                         children: Some(children.clone()),
-                        span: Span::new(start_pos, total_length as u16),
+                        span: Span::new(start_pos, 0), // Removed total_length initialization
                         tag_span,
                     };
                     return Err(ParserError::Ast(AstError::UnexpectedTag(tag), Some(node)));
@@ -264,7 +276,7 @@ impl Parser {
             }
         }
 
-        let span = Span::new(start_pos, total_length as u16);
+        let span = Span::new(start_pos, 0); // Removed total_length initialization
 
         let node = Node::Block {
             block_type: BlockType::Standard,

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

@@ -15,5 +15,4 @@ nodes:
         length: 18
 line_offsets:
   - 0
-  - 0
 errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap.new

@@ -32,7 +32,7 @@ nodes:
                     length: 8
             span:
               start: 0
-              length: 8
+              length: 0
             tag_span:
               start: 0
               length: 8
@@ -48,7 +48,7 @@ nodes:
                     length: 4
             span:
               start: 0
-              length: 8
+              length: 0
             tag_span:
               start: 0
               length: 8
@@ -59,17 +59,16 @@ nodes:
             children: ~
             span:
               start: 60
-              length: 5
+              length: 10
             tag_span:
               start: 0
               length: 8
       span:
         start: 0
-        length: 65
+        length: 70
       tag_span:
         start: 0
         length: 8
 line_offsets:
   - 0
-  - 0
 errors: []

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

@@ -17,7 +17,7 @@ nodes:
               - item
             filters: []
             span:
-              start: 25
+              start: 26
               length: 4
         - Block:
             block_type: Branch
@@ -31,7 +31,7 @@ nodes:
                     length: 8
             span:
               start: 0
-              length: 17
+              length: 0
             tag_span:
               start: 0
               length: 17
@@ -42,17 +42,16 @@ nodes:
             children: ~
             span:
               start: 52
-              length: 6
+              length: 11
             tag_span:
               start: 0
               length: 17
       span:
         start: 0
-        length: 58
+        length: 63
       tag_span:
         start: 0
         length: 17
 line_offsets:
   - 0
-  - 0
 errors: []

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

@@ -22,17 +22,16 @@ nodes:
             children: ~
             span:
               start: 37
-              length: 5
+              length: 10
             tag_span:
               start: 0
               length: 24
       span:
         start: 0
-        length: 42
+        length: 47
       tag_span:
         start: 0
         length: 24
 line_offsets:
   - 0
-  - 0
 errors: []