add query-errors to UI, revert to ts 0.20HEADmaster

1 files changed, 18 insertions, 4 deletions

diff --git a/src/app.rs b/src/app.rs
index 285034b..e299ef8 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -15,6 +15,7 @@ pub struct App {
     path: PathBuf,
     query: Option<Query>,
     query_path: Option<PathBuf>,
+    query_error: Option<String>,
     src: Vec<u8>,
     tree: Tree,
 }
@@ -29,13 +30,20 @@ impl App {
         let path = path.as_ref().to_owned();
 
         let mut parser = Parser::new();
-        parser.set_language(&language).unwrap();
+        parser.set_language(language).unwrap();
 
         let tree = parser.parse(&src, None).unwrap();
         let query_path = query_path.map(|q| q.as_ref().to_owned());
-        let query = query_path.as_ref().map(|p| {
+        let mut query_error = None;
+        let query = query_path.as_ref().and_then(|p| {
             let query_src = std::fs::read_to_string(&p).expect("unable to read query");
-            Query::new(&language, &query_src).expect("query parse error")
+            match Query::new(language, &query_src) {
+                Ok(q) => Some(q),
+                Err(e) => {
+                    query_error = Some(e.to_string());
+                    None
+                }
+            }
         });
 
         Self {
@@ -43,6 +51,7 @@ impl App {
             path,
             query,
             query_path,
+            query_error,
             src: src.to_owned(),
             tree,
             language,
@@ -148,7 +157,7 @@ impl App {
                     write!(
                         tree_string,
                         "@{} ",
-                        style(capture_names[*index as usize]).magenta()
+                        style(&capture_names[*index as usize]).magenta()
                     )
                     .unwrap();
                 }
@@ -219,6 +228,11 @@ impl App {
         term.clear_to_end_of_screen().unwrap();
 
         term.write_line("(C-c) quit").unwrap();
+
+        if let Some(err) = self.query_error.as_ref() {
+            term.write_line(&format!("{}: {err}", style("query error").red()))
+                .unwrap();
+        }
         term.clear_to_end_of_screen().unwrap();
     }