fix: Empty input parsing

rs-tml · Oct 11, 2023 · ef9a484 · ef9a484
1 parent de04b27
commit ef9a484
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 31 deletions.
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -22,29 +22,27 @@ fn criterion_benchmark(c: &mut Criterion) {
 
     c.bench_function("rstml::parse2(simple)", |b| {
         b.iter(|| {
-            let config: rstml::ParserConfig = rstml::ParserConfig::new()
-                .always_self_closed_elements(
-                    vec![
-                        "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta",
-                        "param", "source", "track", "wbr",
-                    ]
-                    .into_iter()
-                    .collect(),
-                );
+            let config = rstml::ParserConfig::new().always_self_closed_elements(
+                vec![
+                    "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta",
+                    "param", "source", "track", "wbr",
+                ]
+                .into_iter()
+                .collect(),
+            );
             rstml::Parser::new(config).parse_simple(tokens.clone())
         })
     });
     c.bench_function("rstml::parse2(rust_site)", |b| {
         b.iter(|| {
-            let config: rstml::ParserConfig = rstml::ParserConfig::new()
-                .always_self_closed_elements(
-                    vec![
-                        "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta",
-                        "param", "source", "track", "wbr",
-                    ]
-                    .into_iter()
-                    .collect(),
-                );
+            let config = rstml::ParserConfig::new().always_self_closed_elements(
+                vec![
+                    "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta",
+                    "param", "source", "track", "wbr",
+                ]
+                .into_iter()
+                .collect(),
+            );
             rstml::Parser::new(config).parse_simple(tokens.clone())
         })
     });

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -52,7 +52,7 @@ impl<C: CustomNode> Parser<C> {
         let mut top_level_nodes = 0;
 
         let mut parser = RecoverableContext::new(self.config.clone().into());
-        while !input.cursor().eof() {
+        while !input.is_empty() {
             let Some(parsed_node) = Node::parse_recoverable(&mut parser, input) else {
                 parser.push_diagnostic(input.error("Node parse failed".to_string()));
                 break;
@@ -101,7 +101,11 @@ impl<C: CustomNode> Parser<C> {
 
         let errors = parser.diagnostics;
 
-        let nodes = if nodes.is_empty() { None } else { Some(nodes) };
+        let nodes = if nodes.is_empty() {
+            Some(vec![])
+        } else {
+            Some(nodes)
+        };
         ParsingResult::from_parts(nodes, errors)
     }
 }
diff --git a/src/parser/recoverable.rs b/src/parser/recoverable.rs
@@ -160,14 +160,10 @@ pub enum ParsingResult<T> {
 impl<T> ParsingResult<T> {
     /// Create new ParsingResult from optional value and accumulated errors.
     pub fn from_parts(value: Option<T>, errors: Vec<Diagnostic>) -> Self {
-        if let Some(token) = value {
-            if errors.is_empty() {
-                Self::Ok(token)
-            } else {
-                Self::Partial(token, errors)
-            }
-        } else {
-            Self::Failed(errors)
+        match (value, errors) {
+            (Some(v), err) if err.is_empty() => Self::Ok(v),
+            (Some(v), err) => Self::Partial(v, err),
+            (None, err) => Self::Failed(err),
         }
     }
 

diff --git a/tests/test.rs b/tests/test.rs
@@ -223,7 +223,7 @@ fn test_block_node() -> Result<()> {
 
 #[test]
 fn test_flat_tree() -> Result<()> {
-    let config: ParserConfig = ParserConfig::new().flat_tree();
+    let config = ParserConfig::new().flat_tree();
 
     let tokens = quote! {
         <div>
@@ -527,7 +527,7 @@ fn test_transform_block_none() -> Result<()> {
         <div>{"foo"}</div>
     };
 
-    let config: ParserConfig = ParserConfig::new().transform_block(|_| Ok(None));
+    let config = ParserConfig::new().transform_block(|_| Ok(None));
     let nodes = Parser::new(config).parse_simple(tokens);
 
     assert!(nodes.is_ok());
@@ -788,7 +788,7 @@ fn test_default_wildcard_failed_to_parse_block() {
         <Foo> </ _>
     };
 
-    let config: ParserConfig = ParserConfig::new().element_close_use_default_wildcard_ident(true);
+    let config = ParserConfig::new().element_close_use_default_wildcard_ident(true);
     let _ = Parser::new(config).parse_simple(tokens).unwrap();
 }
 
@@ -875,6 +875,16 @@ fn test_single_element_with_different_attributes() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn test_empty_input() -> Result<()> {
+    let tokens = quote! {};
+    let nodes = parse2(tokens)?;
+
+    assert!(nodes.is_empty());
+
+    Ok(())
+}
+
 fn get_element(nodes: &[Node], element_index: usize) -> &NodeElement {
     let Some(Node::Element(element)) = nodes.get(element_index) else {
         panic!("expected element")