don't allocate string

Author: joshuadavidthomas

crates/djls-templates/src/lib.rs

@@ -59,6 +59,7 @@ use djls_source::FileKind;
 pub use error::TemplateError;
 pub use lexer::Lexer;
 pub use nodelist::ErrorNode;
+use nodelist::Node;
 pub use nodelist::NodeList;
 pub use parser::ParseError;
 pub use parser::Parser;
@@ -101,12 +102,21 @@ pub fn parse_template(db: &dyn Db, file: File) -> Option<NodeList<'_>> {
     let nodelist = match Parser::new(db, token_stream).parse() {
         Ok(nodelist) => nodelist,
         Err(err) => {
-            // Fatal error - accumulate and return empty
+            // Fatal error - accumulate but still return an error node so spans remain intact
             let template_error = TemplateError::Parser(err.to_string());
             TemplateErrorAccumulator(template_error).accumulate(db);
 
-            let empty_nodelist = Vec::new();
-            NodeList::new(db, empty_nodelist)
+            let text = source.as_ref();
+            let span = djls_source::Span::from_bounds(0, text.len());
+            let error_node = Node::Error {
+                node: ErrorNode {
+                    span,
+                    full_span: span,
+                    error: err,
+                },
+            };
+
+            NodeList::new(db, vec![error_node])
         }
     };
 

crates/djls-templates/src/nodelist.rs

@@ -86,7 +86,6 @@ impl<'db> Node<'db> {
 
 #[derive(Clone, Debug, PartialEq, Eq, salsa::Update)]
 pub struct ErrorNode {
-    pub content: String,
     pub span: Span,
     pub full_span: Span,
     pub error: ParseError,

crates/djls-templates/src/parser.rs

@@ -265,19 +265,18 @@ impl<'db> Parser<'db> {
             .map(|token| {
                 let span = span_from_token(token, self.db);
                 let full_span = token.full_span().unwrap_or(span);
-                (span, full_span, token.lexeme(self.db))
+                (span, full_span)
             });
 
-        let (span, full_span, content) = spans.unwrap_or_else(|| {
+        let (span, full_span) = spans.unwrap_or_else(|| {
             let empty = Span::new(0, 0);
-            (empty, empty, String::new())
+            (empty, empty)
         });
 
         self.report_error(&error);
 
         Node::Error {
             node: ErrorNode {
-                content,
                 span,
                 full_span,
                 error,
@@ -425,7 +424,6 @@ mod tests {
             full_span: (u32, u32),
         },
         Error {
-            content: String,
             span: (u32, u32),
             full_span: (u32, u32),
             error: ParseError,
@@ -471,7 +469,6 @@ mod tests {
                     full_span: (full_span.start, full_span.length),
                 },
                 Node::Error { node } => TestNode::Error {
-                    content: node.content.clone(),
                     span: (node.span.start, node.span.length),
                     full_span: (node.full_span.start, node.full_span.length),
                     error: node.error.clone(),

crates/djls-templates/src/snapshots/djls_templates__parser__tests__errors__parse_unclosed_variable_token.snap

@@ -4,7 +4,6 @@ expression: test_nodelist
 ---
 nodelist:
   - type: Error
-    content: " user"
     span:
       - 2
       - 5