Fixing test errors

Author: matteius

crates/diff-engine/src/changes.rs

@@ -5,7 +5,7 @@
 //! tree edit distance and similarity scoring algorithms.
 
 use crate::tree_edit::{TreeEditDistance, ZhangShashaConfig};
-use crate::similarity_scorer::{SimilarityScorer, ComprehensiveSimilarityScore};
+use crate::similarity_scorer::{SimilarityScorer, SimilarityScoringConfig, ComprehensiveSimilarityScore};
 use smart_diff_parser::{ChangeType, CodeElement, ASTNode, Language};
 use smart_diff_semantic::EnhancedFunctionSignature;
 use serde::{Serialize, Deserialize};
@@ -229,7 +229,7 @@ impl ChangeClassifier {
         Self {
             config: ChangeClassificationConfig::default(),
             tree_edit_distance: TreeEditDistance::with_defaults(),
-            similarity_scorer: Some(SimilarityScorer::new(language)),
+            similarity_scorer: Some(SimilarityScorer::new(language, SimilarityScoringConfig::default())),
             language,
         }
     }
@@ -246,7 +246,7 @@ impl ChangeClassifier {
         Self {
             config,
             tree_edit_distance: TreeEditDistance::new(tree_config),
-            similarity_scorer: Some(SimilarityScorer::new(language)),
+            similarity_scorer: Some(SimilarityScorer::new(language, SimilarityScoringConfig::default())),
             language,
         }
     }
@@ -1119,7 +1119,7 @@ impl ChangeClassifier {
     /// Enable or disable semantic analysis
     pub fn set_semantic_analysis(&mut self, enabled: bool) {
         if enabled && self.similarity_scorer.is_none() {
-            self.similarity_scorer = Some(SimilarityScorer::new(self.language));
+            self.similarity_scorer = Some(SimilarityScorer::new(self.language, SimilarityScoringConfig::default()));
         } else if !enabled {
             self.similarity_scorer = None;
         }

crates/diff-engine/src/engine.rs

@@ -1,11 +1,12 @@
 //! Main diff engine
 
-use crate::changes::ChangeClassifier;
+use crate::changes::{ChangeClassifier, ChangeClassificationConfig};
 use crate::matching::FunctionMatcher;
 use crate::refactoring::RefactoringDetector;
-use crate::tree_edit::{EditCost, TreeEditDistance};
+use crate::similarity_scorer::SimilarityScoringConfig;
+use crate::tree_edit::{TreeEditDistance, ZhangShashaConfig};
 use serde::{Deserialize, Serialize};
-use smart_diff_parser::{Function, MatchResult};
+use smart_diff_parser::{Function, MatchResult, Language};
 use thiserror::Error;
 
 /// Main diff engine that orchestrates the comparison process
@@ -59,11 +60,12 @@ impl Default for DiffEngine {
 
 impl DiffEngine {
     pub fn new() -> Self {
+        let language = Language::Unknown; // Default language, should be configurable
         Self {
             function_matcher: FunctionMatcher::new(0.7),
-            tree_edit_distance: TreeEditDistance::new(EditCost::default()),
-            change_classifier: ChangeClassifier,
-            refactoring_detector: RefactoringDetector::new(),
+            tree_edit_distance: TreeEditDistance::new(ZhangShashaConfig::default()),
+            change_classifier: ChangeClassifier::new(language, ChangeClassificationConfig::default()),
+            refactoring_detector: RefactoringDetector::new(language),
         }
     }
 

crates/diff-engine/src/lib.rs

@@ -45,7 +45,6 @@ pub use tree_edit::{
 };
 pub use smart_diff_parser::MatchResult;
 pub use smart_diff_parser::{Change, ChangeType};
-pub use tree_edit::{EditCost, EditOperation, TreeEditDistance};
 
 /// Re-export commonly used types
 pub type Result<T> = std::result::Result<T, DiffError>;

crates/diff-engine/src/refactoring.rs

@@ -5,7 +5,7 @@
 //! integration with change classification and similarity analysis.
 
 use crate::changes::{ChangeClassifier, DetailedChangeClassification};
-use crate::similarity_scorer::{SimilarityScorer, ComprehensiveSimilarityScore};
+use crate::similarity_scorer::{SimilarityScorer, SimilarityScoringConfig, ComprehensiveSimilarityScore};
 use smart_diff_parser::{Change, RefactoringType, ChangeType, CodeElement, ASTNode, Language};
 use smart_diff_semantic::EnhancedFunctionSignature;
 use serde::{Deserialize, Serialize};
@@ -293,7 +293,7 @@ impl RefactoringDetector {
         Self {
             config: RefactoringDetectionConfig::default(),
             change_classifier: Some(ChangeClassifier::new(language)),
-            similarity_scorer: Some(SimilarityScorer::new(language)),
+            similarity_scorer: Some(SimilarityScorer::new(language, SimilarityScoringConfig::default())),
             language,
         }
     }
@@ -303,7 +303,7 @@ impl RefactoringDetector {
         Self {
             config,
             change_classifier: Some(ChangeClassifier::new(language)),
-            similarity_scorer: Some(SimilarityScorer::new(language)),
+            similarity_scorer: Some(SimilarityScorer::new(language, SimilarityScoringConfig::default())),
             language,
         }
     }
@@ -1952,7 +1952,7 @@ impl RefactoringDetector {
     /// Enable or disable similarity scorer
     pub fn set_similarity_scorer(&mut self, enabled: bool) {
         if enabled && self.similarity_scorer.is_none() {
-            self.similarity_scorer = Some(SimilarityScorer::new(self.language));
+            self.similarity_scorer = Some(SimilarityScorer::new(self.language, SimilarityScoringConfig::default()));
         } else if !enabled {
             self.similarity_scorer = None;
         }

crates/diff-engine/src/similarity_scorer.rs

@@ -1,6 +1,6 @@
 //! Comprehensive similarity scoring algorithm for code comparison
 
-use crate::tree_edit::{EditCost, TreeEditDistance};
+use crate::tree_edit::{EditCost, TreeEditDistance, ZhangShashaConfig};
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use smart_diff_parser::{ASTNode, Language, NodeType};
@@ -198,7 +198,13 @@ struct ContextInfo {
 impl SimilarityScorer {
     pub fn new(language: Language, config: SimilarityScoringConfig) -> Self {
         let signature_extractor = FunctionSignatureExtractor::with_defaults(language);
-        let tree_edit_calculator = TreeEditDistance::new(config.edit_costs.clone());
+        let zhang_shasha_config = ZhangShashaConfig {
+            insert_cost: config.edit_costs.insert,
+            delete_cost: config.edit_costs.delete,
+            update_cost: config.edit_costs.update,
+            ..Default::default()
+        };
+        let tree_edit_calculator = TreeEditDistance::new(zhang_shasha_config);
 
         Self {
             config,