Merge pull request #89 from mobusoperandi/repl-example-parse-fail-fil…

…e-line repl example parse fail file line
mobusoperandi · Feb 21, 2024 · 8faf08a · 8faf08a
2 parents 7b9ef00 + 202e8ef
commit 8faf08a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/src/examples.rs b/src/examples.rs
@@ -1,6 +1,8 @@
+use crate::example_id::ExampleId;
 use crate::expression::ExpressionExample;
 use crate::repl::example::ReplExample;
 use crate::repl::example::NIX_REPL_LANG_TAG;
+use anyhow::Context;
 use itertools::Itertools;
 
 #[derive(Debug, Clone)]
@@ -34,21 +36,24 @@ pub(crate) fn obtain(glob: &str) -> anyhow::Result<Vec<Example>> {
         .filter_map(|(path, ast)| {
             if let comrak::nodes::NodeValue::CodeBlock(code_block) = ast.value {
                 let comrak::nodes::NodeCodeBlock { info, literal, .. } = code_block;
-                match info.split_ascii_whitespace().next() {
+                let line = ast.sourcepos.start.line;
+                let id = ExampleId::new(path, line);
+
+                let maybe_result = match info.split_ascii_whitespace().next() {
                     Some(NIX_REPL_LANG_TAG) => {
-                        let line = ast.sourcepos.start.line;
                         let repl_example =
-                            ReplExample::try_new(path, line, literal.clone()).map(Example::Repl);
+                            ReplExample::try_new(id.clone(), literal.clone()).map(Example::Repl);
                         Some(repl_example)
                     }
                     Some("nix") => {
-                        let line = ast.sourcepos.start.line;
                         let expression_example =
-                            ExpressionExample::new(path, line, literal.clone());
+                            ExpressionExample::new(id.clone(), literal.clone());
                         Some(Ok(Example::Expression(expression_example)))
                     }
                     _ => None,
-                }
+                };
+
+                maybe_result.map(|result| result.context(format!("{id}")))
             } else {
                 None
             }

diff --git a/src/expression.rs b/src/expression.rs
@@ -9,8 +9,7 @@ pub(crate) struct ExpressionExample {
 }
 
 impl ExpressionExample {
-    pub(crate) fn new(path: camino::Utf8PathBuf, line: usize, expression: String) -> Self {
-        let id = ExampleId::new(path, line);
+    pub(crate) fn new(id: ExampleId, expression: String) -> Self {
         Self { id, expression }
     }
 }
diff --git a/src/repl/example.rs b/src/repl/example.rs
@@ -9,13 +9,7 @@ pub(crate) struct ReplExample {
 }
 
 impl ReplExample {
-    pub(crate) fn try_new(
-        source_path: camino::Utf8PathBuf,
-        line: usize,
-        contents: String,
-    ) -> anyhow::Result<Self> {
-        let id = ExampleId::new(source_path, line);
-
+    pub(crate) fn try_new(id: ExampleId, contents: String) -> anyhow::Result<Self> {
         Ok(Self {
             id,
             entries: contents.parse()?,

diff --git a/tests/repl.rs b/tests/repl.rs
@@ -2,6 +2,7 @@ mod util;
 
 use assert_fs::prelude::FileWriteStr;
 use indoc::{formatdoc, indoc};
+use predicates::boolean::PredicateBooleanExt;
 use util::with_eelco;
 
 #[test]
@@ -15,10 +16,13 @@ fn fails_to_parse() {
             "})
             .unwrap();
 
-        eelco
-            .assert()
-            .failure()
-            .stderr("Error: expected prompt, found LFLine(\"nix-shnepl> nope\\n\")\n");
+        let file_path = file.path().to_str().unwrap();
+
+        eelco.assert().failure().stderr(
+            predicates::str::starts_with(format!("Error: {file_path}:1")).and(
+                predicates::str::contains("expected prompt, found LFLine(\"nix-shnepl> nope\\n\")"),
+            ),
+        );
     });
 }