produce values like we had been doing

Author: cscheid

crates/quarto-markdown-pandoc/src/main.rs

@@ -34,7 +34,11 @@ struct Args {
     #[arg(long = "loose")]
     loose: bool,
 
-    #[arg(long = "_internal-report-error-state", hide = true)]
+    #[arg(
+        long = "_internal-report-error-state",
+        hide = true,
+        default_value_t = false
+    )]
     _internal_report_error_state: bool,
 }
 

crates/quarto-markdown-pandoc/src/readers/qmd.rs

@@ -71,14 +71,17 @@ pub fn read<T: Write>(
     let tree = parser
         .parse(&input_bytes, None)
         .expect("Failed to parse input");
+    log_observer.parses.iter().for_each(|parse| {
+        writeln!(output_stream, "tree-sitter parse:").unwrap();
+        parse
+            .messages
+            .iter()
+            .for_each(|msg| writeln!(output_stream, "  {}", msg).unwrap());
+        writeln!(output_stream, "---").unwrap();
+    });
     if log_observer.had_errors() {
         return Err(produce_error_message(input_bytes, &log_observer, filename));
     }
-    log_observer.parses.into_iter().for_each(|parse| {
-        eprintln!("tree-sitter parse:");
-        parse.messages.iter().for_each(|msg| eprintln!("  {}", msg));
-        eprintln!("---");
-    });
 
     let depth = crate::utils::concrete_tree_depth::concrete_tree_depth(&tree);
     // this is here mostly to prevent our fuzzer from blowing the stack

crates/quarto-markdown-pandoc/src/readers/qmd_error_messages.rs

@@ -19,12 +19,10 @@ pub fn produce_error_message(
     let mut result: Vec<String> = vec![];
 
     for parse in &tree_sitter_log.parses {
-        if !parse.found_accept {
-            // there was an error in the block structure; report that.
-            for state in &parse.error_states {
-                let mut msg = error_message_from_parse_state(input_bytes, state, filename);
-                result.append(&mut msg);
-            }
+        // there was an error in the block structure; report that.
+        for state in &parse.error_states {
+            let mut msg = error_message_from_parse_state(input_bytes, state, filename);
+            result.append(&mut msg);
         }
     }
 
@@ -61,19 +59,16 @@ pub fn produce_error_message_json(
     let mut result: Vec<String> = vec![];
 
     for parse in &tree_sitter_log.parses {
-        if !parse.found_accept {
-            // there was an error in the block structure; report that.
-            for state in &parse.error_states {
-                result.push(
-                    serde_json::to_string(&serde_json::json!({
-                        "state": state.state,
-                        "sym": state.sym,
-                        "row": state.row,
-                        "column": state.column,
-                    }))
-                    .unwrap(),
-                );
-            }
+        for state in &parse.error_states {
+            result.push(
+                serde_json::to_string(&serde_json::json!({
+                    "state": state.state,
+                    "sym": state.sym,
+                    "row": state.row,
+                    "column": state.column,
+                }))
+                .unwrap(),
+            );
         }
     }
 

crates/quarto-markdown-pandoc/src/utils/tree_sitter_log_observer.rs

@@ -37,7 +37,10 @@ pub struct TreeSitterLogObserver {
 
 impl TreeSitterLogObserver {
     pub fn had_errors(&self) -> bool {
-        !self.parses.iter().all(|parse| parse.found_accept)
+        !self
+            .parses
+            .iter()
+            .all(|parse| parse.found_accept && parse.error_states.is_empty())
     }
     pub fn log(&mut self, _log_type: tree_sitter::LogType, message: &str) {
         // Implement your logging logic here
@@ -151,6 +154,12 @@ impl TreeSitterLogObserver {
                     params.get("size").unwrap().parse::<usize>().unwrap();
             }
             "lex_external" | "lex_internal" | "shift" | "reduce" => {}
+            "accept" => {
+                self.parses
+                    .last_mut()
+                    .expect("No current parse to log process to")
+                    .found_accept = true;
+            }
             _ => {
                 if self.state != TreeSitterLogState::InParse {
                     return;