refactor: Push conflicting logic into domain

jpedroh · Dec 6, 2023 · 111967e · 111967e
1 parent 4b3cff9
commit 111967e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/bin/src/control.rs b/bin/src/control.rs
@@ -72,18 +72,8 @@ pub fn run_tool_on_merge_scenario(
         &matchings_left_right,
     );
 
-    match has_conflict(&result) {
+    match result.has_conflict() {
         true => Ok(ExecutionResult::WithConflicts(result.to_string())),
         false => Ok(ExecutionResult::WithoutConflicts(result.to_string())),
     }
 }
-
-fn has_conflict(result: &merge::MergedCSTNode) -> bool {
-    match result {
-        merge::MergedCSTNode::NonTerminal { children, .. } => {
-            children.iter().any(|child| has_conflict(child))
-        }
-        merge::MergedCSTNode::Terminal { .. } => false,
-        merge::MergedCSTNode::Conflict { .. } => true,
-    }
-}
diff --git a/merge/src/merged_cst_node.rs b/merge/src/merged_cst_node.rs
@@ -66,3 +66,15 @@ impl ToString for MergedCSTNode<'_> {
         }
     }
 }
+
+impl MergedCSTNode<'_> {
+    pub fn has_conflict(&self) -> bool {
+        match self {
+            MergedCSTNode::NonTerminal { children, .. } => {
+                children.iter().any(|child| child.has_conflict())
+            }
+            MergedCSTNode::Terminal { .. } => false,
+            MergedCSTNode::Conflict { .. } => true,
+        }
+    }
+}