fix(error): Improve error reporting

cobalt-org · Nov 17, 2018 · e372470 · e372470
1 parent bd2c71c
commit e372470
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/liquid-error/src/error.rs b/liquid-error/src/error.rs
@@ -176,9 +176,6 @@ const ERROR_DESCRIPTION: &str = "liquid";
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         writeln!(f, "{}: {}", ERROR_DESCRIPTION, self.inner.msg)?;
-        if let Some(ref cause) = self.inner.cause {
-            writeln!(f, "cause: {}", cause)?;
-        }
         for trace in &self.inner.user_backtrace {
             if let Some(trace) = trace.get_trace() {
                 writeln!(f, "from: {}", trace)?;

diff --git a/liquid-interpreter/src/context.rs b/liquid-interpreter/src/context.rs
@@ -169,15 +169,17 @@ impl<'g> Stack<'g> {
         let mut indexes = path.iter();
         let key = indexes
             .next()
-            .ok_or_else(|| Error::with_msg("No index provided"))?;
+            .ok_or_else(|| Error::with_msg("No variable provided"))?;
         let key = key.to_str();
         let value = self.get_root(key.as_ref())?;
 
         indexes.fold(Ok(value), |value, index| {
             let value = value?;
             let child = value.get(index);
             let child = child.ok_or_else(|| {
-                Error::with_msg("Invalid index").context("index", key.as_ref().to_owned())
+                Error::with_msg("Unknown index")
+                    .context("variable", format!("{}", path))
+                    .context("index", format!("{}", index))
             })?;
             Ok(child)
         })
@@ -190,7 +192,7 @@ impl<'g> Stack<'g> {
             }
         }
         self.globals
-            .ok_or_else(|| Error::with_msg("Invalid index").context("index", name.to_owned()))
+            .ok_or_else(|| Error::with_msg("Unknown variable").context("variable", name.to_owned()))
             .and_then(|g| g.get(name))
             .or_else(|err| self.get_index(name).ok_or_else(|| err))
     }

diff --git a/liquid-interpreter/src/filter_chain.rs b/liquid-interpreter/src/filter_chain.rs
@@ -71,6 +71,7 @@ impl FilterChain {
             entry = f
                 .filter(&entry, &*arguments)
                 .chain("Filter error")
+                .context_with(|| ("filter".to_owned(), format!("{}", self)))
                 .context_with(|| ("input".to_owned(), format!("{}", &entry)))
                 .context_with(|| ("args".to_owned(), itertools::join(&arguments, ", ")))?;
         }

diff --git a/liquid-interpreter/src/globals.rs b/liquid-interpreter/src/globals.rs
@@ -13,6 +13,6 @@ pub trait Globals: fmt::Debug {
 impl Globals for Object {
     fn get<'a>(&'a self, name: &str) -> Result<&'a Value> {
         self.get(name)
-            .ok_or_else(|| Error::with_msg("Invalid index").context("index", name.to_owned()))
+            .ok_or_else(|| Error::with_msg("Unknown variable").context("variable", name.to_owned()))
     }
 }
diff --git a/src/filters/math.rs b/src/filters/math.rs
@@ -12,7 +12,7 @@ pub fn abs(input: &Value, args: &[Value]) -> FilterResult {
             .to_integer()
             .map(|i| Value::scalar(i.abs()))
             .or_else(|| s.to_float().map(|i| Value::scalar(i.abs())))
-            .ok_or_else(|| invalid_input("Numeric value expected")),
+            .ok_or_else(|| invalid_input("Numeric expected")),
         _ => Err(invalid_input("Number expected")),
     }
 }