Merge branch 'main' of github.com:opensensor/codediff

Author: matteius

crates/diff-engine/src/changes.rs

@@ -1124,6 +1124,22 @@ impl ChangeClassifier {
             self.similarity_scorer = None;
         }
     }
+
+    /// Detect if a change represents a function split
+    pub fn detect_split(&self, source: &CodeElement, targets: &[CodeElement]) -> bool {
+        targets.len() > 1
+            && targets
+                .iter()
+                .all(|t| t.name.contains(&source.name) || source.name.contains(&t.name))
+    }
+
+    /// Detect if changes represent a function merge
+    pub fn detect_merge(&self, sources: &[CodeElement], target: &CodeElement) -> bool {
+        sources.len() > 1
+            && sources
+                .iter()
+                .all(|s| s.name.contains(&target.name) || target.name.contains(&s.name))
+    }
 }
 
 #[cfg(test)]
@@ -1456,20 +1472,3 @@ mod tests {
         assert!(classifier.similarity_scorer.is_some());
     }
 }
-
-    /// Detect if a change represents a function split
-    pub fn detect_split(&self, source: &CodeElement, targets: &[CodeElement]) -> bool {
-        targets.len() > 1
-            && targets
-                .iter()
-                .all(|t| t.name.contains(&source.name) || source.name.contains(&t.name))
-    }
-
-    /// Detect if changes represent a function merge
-    pub fn detect_merge(&self, sources: &[CodeElement], target: &CodeElement) -> bool {
-        sources.len() > 1
-            && sources
-                .iter()
-                .all(|s| s.name.contains(&target.name) || target.name.contains(&s.name))
-    }
-}

crates/diff-engine/src/tree_edit.rs

@@ -283,15 +283,6 @@ impl TreeEditDistance {
         }
     }
 
-impl Default for EditCost {
-    fn default() -> Self {
-        Self {
-            insert: 1.0,
-            delete: 1.0,
-            update: 1.0,
-        }
-    }
-
     /// Preprocess tree to extract information needed for Zhang-Shasha algorithm
     fn preprocess_tree(&self, tree: &ASTNode) -> TreeInfo {
         let node_count = self.count_nodes(tree);
@@ -581,6 +572,16 @@ impl Default for EditCost {
     }
 }
 
+impl Default for EditCost {
+    fn default() -> Self {
+        Self {
+            insert: 1.0,
+            delete: 1.0,
+            update: 1.0,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;