Be more defensive against parse errors

Author: lionel-

crates/ark/src/console_annotate.rs

@@ -183,9 +183,8 @@ pub(crate) fn annotate_input(
     let annotated_code = if let Some(breakpoints) = breakpoints {
         let parse = aether_parser::parse(code, Default::default());
         if let Some(err) = parse.error() {
-            return Err(anyhow!(
-                "Unexpected parse error in `annotate_input()`: {err}"
-            ));
+            // Shouldn't happen since we're only operating on code that was parsed by R
+            return Err(anyhow!("Parse error in `annotate_input()`: {err}"));
         }
 
         let root = parse.tree();
@@ -246,7 +245,13 @@ pub(crate) fn annotate_source(
     let wrapped = format!("{{\n{code}\n}}");
     let line_index = LineIndex::new(&wrapped);
 
-    let root = aether_parser::parse(&wrapped, Default::default()).tree();
+    let parse = aether_parser::parse(&wrapped, Default::default());
+    if let Some(err) = parse.error() {
+        // Shouldn't happen since we're only operating on code that was parsed by R
+        return Err(anyhow!("Parse error in `annotate_input()`: {err}"));
+    }
+
+    let root = parse.tree();
 
     // `line_offset` = -1 because:
     // - Wrapped line 0 is `{`

crates/ark/src/interface.rs

@@ -354,9 +354,18 @@ impl PendingInputs {
         breakpoints: Option<&mut [Breakpoint]>,
     ) -> anyhow::Result<ParseResult<PendingInputs>> {
         let input = if let Some(location) = location {
-            let annotated_code = annotate_input(code, location, breakpoints)?;
-            log::trace!("Annotated code: \n```\n{annotated_code}\n```");
-            harp::ParseInput::SrcFile(&SrcFile::new_virtual_empty_filename(annotated_code.into()))
+            match annotate_input(code, location, breakpoints) {
+                Ok(annotated_code) => {
+                    log::trace!("Annotated code: \n```\n{annotated_code}\n```");
+                    harp::ParseInput::SrcFile(&SrcFile::new_virtual_empty_filename(
+                        annotated_code.into(),
+                    ))
+                },
+                Err(err) => {
+                    log::warn!("{err:?}");
+                    harp::ParseInput::Text(code)
+                },
+            }
         } else if harp::get_option_bool("keep.source") {
             harp::ParseInput::SrcFile(&SrcFile::new_virtual_empty_filename(code.into()))
         } else {