Fixed all remaining issues

Author: ndbroadbent

renamify-cli/src/replace.rs

@@ -1,7 +1,6 @@
 use anyhow::{anyhow, Context, Result};
 use regex::Regex;
 use renamify_core::{apply_plan, create_simple_plan, Plan, PlanOptions, Preview};
-use serde_json;
 use std::io::{self, Write};
 use std::path::PathBuf;
 
@@ -154,7 +153,7 @@ fn commit_changes(plan: &Plan) -> Result<()> {
 
     // Check if we're in a git repository
     let status = Command::new("git")
-        .args(&["status", "--porcelain"])
+        .args(["status", "--porcelain"])
         .output()
         .context("Failed to check git status")?;
 
@@ -192,7 +191,7 @@ fn commit_changes(plan: &Plan) -> Result<()> {
     let message = format!("Replace '{}' with '{}'", plan.search, plan.replace);
 
     let status = Command::new("git")
-        .args(&["commit", "-m", &message])
+        .args(["commit", "-m", &message])
         .status()
         .context("Failed to create git commit")?;
 

renamify-cli/tests/case_style_filtering.rs

@@ -33,7 +33,7 @@ CompoundTitle: Title Case Example
     fn run_search(dir: &Path, styles: &str) -> String {
         let output = std::process::Command::new(env!("CARGO_BIN_EXE_renamify"))
             .current_dir(dir)
-            .args(&[
+            .args([
                 "search",
                 "test case", // Search for "test case" in various forms
                 "--only-styles",
@@ -178,7 +178,7 @@ mixed_caseCASE
     fn run_search(dir: &Path, styles: &str) -> String {
         let output = std::process::Command::new(env!("CARGO_BIN_EXE_renamify"))
             .current_dir(dir)
-            .args(&[
+            .args([
                 "search",
                 "case", // Search for single word "case"
                 "--only-styles",
@@ -287,7 +287,7 @@ TEST_CASE
     // Test with multiple styles selected
     let output = std::process::Command::new(env!("CARGO_BIN_EXE_renamify"))
         .current_dir(temp_dir.path())
-        .args(&[
+        .args([
             "search",
             "test case",
             "--only-styles",
@@ -347,8 +347,8 @@ let another-var = 10;       // unrelated kebab
 
     // Test 1: Get results for lower style alone (replacing original)
     // For now, we'll use snake as the baseline test
-    let snake_baseline_output = std::process::Command::new(&get_cli_path())
-        .args(&[
+    let snake_baseline_output = std::process::Command::new(get_cli_path())
+        .args([
             "search",
             "case",
             "--only-styles",
@@ -364,8 +364,8 @@ let another-var = 10;       // unrelated kebab
         count_matches(&String::from_utf8(snake_baseline_output.stdout).unwrap());
 
     // Test 2: Get results for snake style alone
-    let snake_output = std::process::Command::new(&get_cli_path())
-        .args(&[
+    let snake_output = std::process::Command::new(get_cli_path())
+        .args([
             "search",
             "case",
             "--only-styles",
@@ -380,8 +380,8 @@ let another-var = 10;       // unrelated kebab
     let snake_matches = count_matches(&String::from_utf8(snake_output.stdout).unwrap());
 
     // Test 3: Get results for kebab style alone
-    let kebab_output = std::process::Command::new(&get_cli_path())
-        .args(&[
+    let kebab_output = std::process::Command::new(get_cli_path())
+        .args([
             "search",
             "case",
             "--only-styles",
@@ -396,8 +396,8 @@ let another-var = 10;       // unrelated kebab
     let kebab_matches = count_matches(&String::from_utf8(kebab_output.stdout).unwrap());
 
     // Test 4: Get results for combined styles
-    let combined_output = std::process::Command::new(&get_cli_path())
-        .args(&[
+    let combined_output = std::process::Command::new(get_cli_path())
+        .args([
             "search",
             "case",
             "--only-styles",
@@ -450,8 +450,8 @@ let unrelated_variable = 6; // should not match any "case" search
     }
 
     // Test that lower+snake doesn't find camel/pascal matches
-    let output = std::process::Command::new(&get_cli_path())
-        .args(&[
+    let output = std::process::Command::new(get_cli_path())
+        .args([
             "search",
             "case",
             "--only-styles",
@@ -471,7 +471,7 @@ let unrelated_variable = 6; // should not match any "case" search
     // When searching for single word "case" with lower+snake styles,
     // both styles generate "case" as the pattern, so it matches all instances of "case"
     // This includes "case" standalone and "case" within compound words
-    assert!(matches.len() > 0, "Should find matches for lower+snake");
+    assert!(!matches.is_empty(), "Should find matches for lower+snake");
 
     // Verify that all matches are for the "case" pattern
     let all_case_matches = matches
@@ -526,8 +526,8 @@ let Test Case = 8;      // title
 
     // Get individual results for each style
     for style in &all_styles {
-        let output = std::process::Command::new(&get_cli_path())
-            .args(&["search", "case", "--only-styles", style, "--output", "json"])
+        let output = std::process::Command::new(get_cli_path())
+            .args(["search", "case", "--only-styles", style, "--output", "json"])
             .current_dir(temp_dir.path())
             .output()
             .expect("Failed to execute command");
@@ -551,8 +551,8 @@ let Test Case = 8;      // title
     ];
 
     for (combo_str, combo_styles) in combinations {
-        let output = std::process::Command::new(&get_cli_path())
-            .args(&[
+        let output = std::process::Command::new(get_cli_path())
+            .args([
                 "search",
                 "case",
                 "--only-styles",

renamify-core/src/ambiguity/file_context.rs

@@ -230,6 +230,7 @@ mod tests {
     fn test_analyze_camel_case_file() {
         let mut analyzer = FileContextAnalyzer::new();
         analyzer.min_identifiers_threshold = 5; // Lower threshold for test
+        #[allow(clippy::needless_raw_string_hashes)]
         let content = r#"
             function getUserData() {
                 const userId = getUserId();
@@ -253,6 +254,7 @@ mod tests {
     fn test_analyze_snake_case_file() {
         let mut analyzer = FileContextAnalyzer::new();
         analyzer.min_identifiers_threshold = 5; // Lower threshold for test
+        #[allow(clippy::needless_raw_string_hashes)]
         let content = r#"
             def get_user_data():
                 user_id = get_user_id()
@@ -285,6 +287,7 @@ mod tests {
     #[test]
     fn test_mixed_styles() {
         let analyzer = FileContextAnalyzer::new();
+        #[allow(clippy::needless_raw_string_hashes)]
         let content = r#"
             const USER_CONSTANT = 100;
             function getUserName() { }

renamify-core/src/ambiguity/resolver.rs

@@ -320,10 +320,12 @@ mod tests {
     #[test]
     fn test_language_heuristic_ruby() {
         let resolver = AmbiguityResolver::new();
-        let mut context = AmbiguityContext::default();
-        context.file_path = Some(PathBuf::from("test.rb"));
-        context.line_content = Some("class API".to_string());
-        context.match_position = Some(6); // Position after "class "
+        let context = AmbiguityContext {
+            file_path: Some(PathBuf::from("test.rb")),
+            line_content: Some("class API".to_string()),
+            match_position: Some(6), // Position after "class "
+            ..Default::default()
+        };
 
         // "API" could be Pascal or SCREAMING_SNAKE
         let result = resolver.resolve("API", "Interface", &context);

renamify-core/src/case_model.rs

@@ -102,9 +102,45 @@ pub fn detect_style(s: &str) -> Option<Style> {
             if is_train_case(s) {
                 Some(Style::Train)
             } else {
+                // Mixed case with hyphens but not Train case
+                // Return None for inconsistent patterns like "hello-World" or "tool-Specific"
+                // These don't follow any standard naming convention
                 None
             }
         },
+        // Mixed underscore and hyphen - detect based on dominant style
+        (true, true, false, false, _, _) => {
+            // For identifiers like "foo_bar_baz_qux-specific" or "Tool-specific-Tool"
+            // Determine the primary style based on what comes before the first separator change
+            if let Some(hyphen_pos) = s.find('-') {
+                if let Some(underscore_pos) = s.find('_') {
+                    // Whichever separator comes first determines the primary style
+                    if underscore_pos < hyphen_pos {
+                        // Starts with underscores, so primarily snake_case
+                        if has_upper && !has_lower {
+                            Some(Style::ScreamingSnake)
+                        } else {
+                            Some(Style::Snake)
+                        }
+                    } else {
+                        // Starts with hyphens, so primarily kebab-case
+                        if has_upper && !has_lower {
+                            Some(Style::ScreamingTrain)
+                        } else if is_train_case(&s[..=hyphen_pos]) {
+                            Some(Style::Train)
+                        } else {
+                            Some(Style::Kebab)
+                        }
+                    }
+                } else {
+                    // Should not happen since has_underscore is true
+                    Some(Style::Snake)
+                }
+            } else {
+                // Should not happen since has_hyphen is true
+                Some(Style::Snake)
+            }
+        },
         (false, false, true, false, _, true) => Some(Style::Dot),
         (false, false, false, true, true, true) => {
             if is_title_case(s) {