core

crates/core/src/analysis.rs

@@ -1,5 +1,7 @@
-use anyhow::{anyhow, Result};
-use grit_util::{traverse, Ast, AstNode, Order};
+use grit_util::{
+    error::{GritPatternError, GritResult},
+    traverse, Ast, AstNode, Order,
+};
 use marzano_language::grit_parser::MarzanoGritParser;
 use marzano_util::{cursor_wrapper::CursorWrapper, node_with_source::NodeWithSource};
 use std::collections::BTreeMap;
@@ -23,8 +25,8 @@ fn walk_call_tree(
     node: &NodeWithSource,
     libs: &BTreeMap<String, String>,
     grit_parser: &mut MarzanoGritParser,
-    predicate: &dyn Fn(&NodeWithSource) -> Result<bool>,
-) -> Result<bool> {
+    predicate: &dyn Fn(&NodeWithSource) -> GritResult<bool>,
+) -> GritResult<bool> {
     let cursor = node.walk();
     for n in traverse(cursor, Order::Pre) {
         if predicate(&n)? {
@@ -35,7 +37,7 @@ fn walk_call_tree(
         }
         let name = n
             .child_by_field_name("name")
-            .ok_or_else(|| anyhow!("missing name of nodeLike"))?;
+            .ok_or_else(|| GritPatternError::new("missing name of nodeLike"))?;
         let name = name.text()?;
         let name = OsStr::new(name.trim());
         let maybe_call = libs
@@ -53,15 +55,15 @@ pub fn is_multifile(
     root: &NodeWithSource,
     libs: &BTreeMap<String, String>,
     grit_parser: &mut MarzanoGritParser,
-) -> Result<bool> {
+) -> GritResult<bool> {
     walk_call_tree(root, libs, grit_parser, &|n| Ok(n.node.kind() == "files"))
 }
 
 pub fn has_limit(
     root: &NodeWithSource,
     libs: &BTreeMap<String, String>,
     grit_parser: &mut MarzanoGritParser,
-) -> Result<bool> {
+) -> GritResult<bool> {
     walk_call_tree(root, libs, grit_parser, &|n| {
         Ok(n.node.kind() == "patternLimit")
     })
@@ -72,29 +74,29 @@ pub fn is_async(
     root: &NodeWithSource,
     libs: &BTreeMap<String, String>,
     grit_parser: &mut MarzanoGritParser,
-) -> Result<bool> {
+) -> GritResult<bool> {
     walk_call_tree(root, libs, grit_parser, &|n| {
         if n.node.kind() != "nodeLike" {
             return Ok(false);
         }
         let name = n
             .child_by_field_name("name")
-            .ok_or_else(|| anyhow!("missing name of nodeLike"))?;
+            .ok_or_else(|| GritPatternError::new("missing name of nodeLike"))?;
         let name = name.text()?;
         Ok(name == "llm_chat")
     })
 }
 
 /// Return true if the pattern attempts to define itself
-pub fn defines_itself(root: &NodeWithSource, root_name: &str) -> Result<bool> {
+pub fn defines_itself(root: &NodeWithSource, root_name: &str) -> GritResult<bool> {
     let cursor = root.node.walk();
     for n in traverse(CursorWrapper::new(cursor, root.source), Order::Pre) {
         if n.node.kind() != "patternDefinition" {
             continue;
         }
         let name = n
             .child_by_field_name("name")
-            .ok_or_else(|| anyhow!("missing name of patternDefinition"))?;
+            .ok_or_else(|| GritPatternError::new("missing name of patternDefinition"))?;
         let name = name.text()?;
         let name = name.trim();
         if name == root_name {
@@ -114,7 +116,7 @@ pub fn get_dependents_of_target_patterns_by_traversal_from_src(
     src: &str,
     parser: &mut MarzanoGritParser,
     target_patterns: &[&String],
-) -> Result<Vec<String>> {
+) -> GritResult<Vec<String>> {
     let mut dependents = <Vec<String>>::new();
     let node_like = "nodeLike";
     let predicate_call = "predicateCall";
@@ -146,7 +148,7 @@ pub fn get_dependents_of_target_patterns_by_traversal_from_src(
         }) {
             let name = n
                 .child_by_field_name("name")
-                .ok_or_else(|| anyhow!("missing name of nodeLike"))?;
+                .ok_or_else(|| GritPatternError::new("missing name of nodeLike"))?;
             let name = name.text()?;
             let name = name.trim().to_string();
 
@@ -178,7 +180,7 @@ fn find_child_tree_definition(
     libs: &BTreeMap<String, String>,
     traversed_stack: &mut Vec<String>,
     name: &str,
-) -> Result<Option<marzano_language::language::Tree>> {
+) -> GritResult<Option<marzano_language::language::Tree>> {
     if !traversed_stack.contains(&name.to_string()) {
         if let Some(file_body) = libs.get(file_name) {
             traversed_stack.push(name.to_owned());

crates/core/src/api.rs

@@ -1,6 +1,6 @@
 use crate::{fs, problem::Problem, tree_sitter_serde::tree_sitter_node_to_json};
-use anyhow::{bail, Result};
 use grit_pattern_matcher::file_owners::FileOwner;
+use grit_util::error::{GritPatternError, GritResult};
 pub use grit_util::ByteRange;
 use grit_util::{AnalysisLog as GritAnalysisLog, Ast, Position, Range, VariableMatch};
 use im::Vector;
@@ -115,9 +115,9 @@ impl MatchResult {
 
     pub(crate) fn file_to_match_result(
         file: &Vector<&FileOwner<Tree>>,
-    ) -> Result<Option<MatchResult>> {
+    ) -> GritResult<Option<MatchResult>> {
         if file.is_empty() {
-            bail!("cannot have file with no versions")
+            return Err(GritPatternError::new("cannot have file with no versions"));
         } else if file.len() == 1 {
             let file = file.last().unwrap();
             if file.new {
@@ -288,7 +288,7 @@ pub fn is_match(result: &MatchResult) -> bool {
 
 pub trait FileMatchResult {
     fn file_name(&self) -> &str;
-    fn content(&self) -> Result<&str>;
+    fn content(&self) -> GritResult<&str>;
     fn ranges(&mut self) -> &Vec<Range>;
     // A verb representing the action taken on the file
     fn action() -> &'static str;
@@ -395,13 +395,13 @@ impl FileMatchResult for Match {
     fn action() -> &'static str {
         "matched"
     }
-    fn content(&self) -> Result<&str> {
+    fn content(&self) -> GritResult<&str> {
         let Some(content) = self.content.as_deref() else {
-            bail!("No content in match")
+            return Err(GritPatternError::new("No content in match"));
         };
 
         if content.is_empty() {
-            bail!("No content in match")
+            return Err(GritPatternError::new("No content in match"));
         } else {
             Ok(content)
         }
@@ -437,7 +437,7 @@ impl EntireFile {
     }
 
     /// Create an entire file from a file owner, including handling source maps and byte ranges
-    fn from_file(file: &FileOwner<Tree>) -> Result<Self> {
+    fn from_file(file: &FileOwner<Tree>) -> GritResult<Self> {
         let mut basic = if let Some(source_map) = &file.tree.source_map {
             let outer_source = source_map.fill_with_inner(&file.tree.source)?;
 
@@ -483,7 +483,7 @@ impl Rewrite {
     fn file_to_rewrite(
         initial: &FileOwner<Tree>,
         rewritten_file: &FileOwner<Tree>,
-    ) -> Result<Self> {
+    ) -> GritResult<Self> {
         let original = EntireFile::from_file(initial)?;
         let rewritten = EntireFile::from_file(rewritten_file)?;
         Ok(Rewrite::new(original, rewritten, None))
@@ -500,12 +500,12 @@ impl FileMatchResult for Rewrite {
     fn action() -> &'static str {
         "rewritten"
     }
-    fn content(&self) -> Result<&str> {
+    fn content(&self) -> GritResult<&str> {
         self.rewritten.content.as_deref().ok_or_else(|| {
-            anyhow::anyhow!(
+            GritPatternError::new(format!(
                 "No content in rewritten file {}",
                 self.rewritten.source_file
-            )
+            ))
         })
     }
 }
@@ -535,14 +535,19 @@ pub enum EnforcementLevel {
 }
 
 impl FromStr for EnforcementLevel {
-    type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self> {
+    type Err = GritPatternError;
+    fn from_str(s: &str) -> GritResult<Self> {
         match s {
             "none" => Ok(EnforcementLevel::None),
             "info" => Ok(EnforcementLevel::Info),
             "warn" => Ok(EnforcementLevel::Warn),
             "error" => Ok(EnforcementLevel::Error),
-            _ => bail!("'{}' is not a valid level", s),
+            _ => {
+                return Err(GritPatternError::new(format!(
+                    "'{}' is not a valid level",
+                    s
+                )))
+            }
         }
     }
 }
@@ -628,9 +633,12 @@ impl FileMatchResult for CreateFile {
     fn action() -> &'static str {
         "created"
     }
-    fn content(&self) -> Result<&str> {
+    fn content(&self) -> GritResult<&str> {
         self.rewritten.content.as_deref().ok_or_else(|| {
-            anyhow::anyhow!("No content in created file {}", self.rewritten.source_file)
+            GritPatternError::new(format!(
+                "No content in created file {}",
+                self.rewritten.source_file
+            ))
         })
     }
 }
@@ -661,9 +669,12 @@ impl FileMatchResult for RemoveFile {
     fn action() -> &'static str {
         "removed"
     }
-    fn content(&self) -> Result<&str> {
+    fn content(&self) -> GritResult<&str> {
         self.original.content.as_deref().ok_or_else(|| {
-            anyhow::anyhow!("No content in removed file {}", self.original.source_file)
+            GritPatternError::new(format!(
+                "No content in removed file {}",
+                self.original.source_file
+            ))
         })
     }
 }

crates/core/src/ast_node.rs

@@ -2,7 +2,6 @@ use crate::{
     marzano_context::MarzanoContext, marzano_resolved_pattern::MarzanoResolvedPattern,
     problem::MarzanoQueryContext,
 };
-use anyhow::{anyhow, Result};
 
 use grit_pattern_matcher::{
     binding::Binding,
@@ -11,7 +10,10 @@ use grit_pattern_matcher::{
         ResolvedPattern, State,
     },
 };
-use grit_util::{AnalysisLogs, AstNode, Language};
+use grit_util::{
+    error::{GritPatternError, GritResult},
+    AnalysisLogs, AstNode, Language,
+};
 use marzano_language::language::{FieldId, LeafEquivalenceClass, MarzanoLanguage, SortId};
 use marzano_util::node_with_source::NodeWithSource;
 
@@ -58,7 +60,7 @@ impl Matcher<MarzanoQueryContext> for ASTNode {
         init_state: &mut State<'a, MarzanoQueryContext>,
         context: &'a MarzanoContext,
         logs: &mut AnalysisLogs,
-    ) -> Result<bool> {
+    ) -> GritResult<bool> {
         let Some(binding) = binding.get_last_binding() else {
             return Ok(false);
         };
@@ -137,10 +139,14 @@ pub struct AstLeafNode {
 }
 
 impl AstLeafNode {
-    pub fn new<'a>(sort: SortId, text: &str, language: &impl MarzanoLanguage<'a>) -> Result<Self> {
+    pub fn new<'a>(
+        sort: SortId,
+        text: &str,
+        language: &impl MarzanoLanguage<'a>,
+    ) -> GritResult<Self> {
         let equivalence_class = language
             .get_equivalence_class(sort, text)
-            .map_err(|e| anyhow!(e))?;
+            .map_err(|e| GritPatternError::new(e))?;
         let text = text.trim();
         Ok(Self {
             sort,
@@ -169,7 +175,7 @@ impl Matcher<MarzanoQueryContext> for AstLeafNode {
         _state: &mut State<'a, MarzanoQueryContext>,
         _context: &'a MarzanoContext<'a>,
         _logs: &mut AnalysisLogs,
-    ) -> Result<bool> {
+    ) -> GritResult<bool> {
         let Some(node) = binding.get_last_binding().and_then(Binding::singleton) else {
             return Ok(false);
         };