cli: Check queries when running tree-sitter test

2019-10-18 14:42:52 -07:00 · 2019-10-18 14:42:52 -07:00 · e14e285a10
commit e14e285a10
parent b73b31356d
6 changed files with 69 additions and 20 deletions
--- a/cli/src/error.rs
+++ b/cli/src/error.rs
@ -52,7 +52,25 @@ impl Error {

 impl<'a> From<QueryError> for Error {
    fn from(error: QueryError) -> Self {
-        Error::new(format!("{:?}", error))
+        match error {
+            QueryError::Capture(row, c) => Error::new(format!(
+                "Query error on line {}: Invalid capture name {}",
+                row, c
+            )),
+            QueryError::Field(row, f) => Error::new(format!(
+                "Query error on line {}: Invalid field name {}",
+                row, f
+            )),
+            QueryError::NodeType(row, t) => Error::new(format!(
+                "Query error on line {}. Invalid node type {}",
+                row, t
+            )),
+            QueryError::Syntax(row, l) => Error::new(format!(
+                "Query error on line {}. Invalid syntax:\n{}",
+                row, l
+            )),
+            QueryError::Predicate(p) => Error::new(format!("Query error: {}", p)),
+        }
    }
 }