checkpoint

Author: joshuadavidthomas

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

@@ -261,12 +261,10 @@ impl Parser {
         let start_token = self.peek_previous()?;
         let start_pos = start_token.start().unwrap_or(0);
 
-        // If we start with a newline, skip it
         if matches!(start_token.token_type(), TokenType::Newline) {
             return self.next_node();
         }
 
-        // Use TokenType's Display implementation for formatting
         let mut text = start_token.token_type().to_string();
         let mut total_length: u32 = u32::try_from(text.len()).unwrap();
 
@@ -286,7 +284,6 @@ impl Parser {
             }
         }
 
-        // Skip empty text nodes
         if text.trim().is_empty() {
             self.next_node()
         } else {
@@ -303,14 +300,18 @@ impl Parser {
         start: &str,
         end: Option<&str>,
     ) -> Result<Node, ParserError> {
-        let start_token = self.peek_previous()?;
-        let start_pos = start_token.start().unwrap_or(0);
-        let total_length = (content.len() + start.len() + end.map_or(0, |e| e.len())) as u32;
-        let span = Span::new(start_pos, total_length);
-        Ok(Node::Comment {
-            content: content.to_string(),
-            span,
-        })
+        let token = self.peek_previous()?;
+        let start_pos = token.start().unwrap_or(0);
+
+        // Only treat Django comments as Comment nodes
+        if start == "{#" && end == Some("#}") {
+            Ok(Node::Comment {
+                content: content.to_string(),
+                span: Span::new(start_pos, token.token_type().len().unwrap_or(0) as u32),
+            })
+        } else {
+            self.parse_text()
+        }
     }
 
     fn peek(&self) -> Result<Token, ParserError> {

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

@@ -3,15 +3,15 @@ source: crates/djls-template-ast/src/parser.rs
 expression: ast
 ---
 nodes:
-  - Comment:
-      content: HTML comment
+  - Text:
+      content: "<!-- HTML comment -->"
       span:
         start: 0
-        length: 19
+        length: 21
   - Comment:
       content: Django comment
       span:
         start: 21
-        length: 18
+        length: 20
 line_offsets:
   - 0

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

@@ -188,7 +188,7 @@ nodes:
                               content: "        (no groups)"
                               span:
                                 start: 290
-                                length: 20
+                                length: 19
                 closing:
                   Closing:
                     tag:
@@ -221,7 +221,7 @@ nodes:
                       content: "    Guest"
                       span:
                         start: 338
-                        length: 10
+                        length: 9
         closing:
           Closing:
             tag: