diff --git a/codex-rs/file-search/src/lib.rs b/codex-rs/file-search/src/lib.rs index 8754181670..7a338792d0 100644 --- a/codex-rs/file-search/src/lib.rs +++ b/codex-rs/file-search/src/lib.rs @@ -25,6 +25,14 @@ pub struct FileSearchResults { pub total_match_count: usize, } +/// Sort matches in-place by descending score, then ascending path. +fn sort_matches(matches: &mut Vec<(u32, String)>) { + matches.sort_by(|a, b| match b.0.cmp(&a.0) { + std::cmp::Ordering::Equal => a.1.cmp(&b.1), + other => other, + }); +} + pub trait Reporter { fn report_match(&self, file: &str, score: u32); fn warn_matches_truncated(&self, total_match_count: usize, shown_match_count: usize); @@ -183,7 +191,7 @@ pub async fn run( } let mut matches: Vec<(u32, String)> = global_heap.into_iter().map(|r| r.0).collect(); - matches.sort_by(|a, b| b.0.partial_cmp(&a.0).unwrap_or(std::cmp::Ordering::Equal)); + sort_matches(&mut matches); Ok(FileSearchResults { matches, @@ -281,4 +289,24 @@ mod tests { let score = pattern.score(haystack, &mut matcher); assert_eq!(score, None); } + + #[test] + fn tie_breakers_sort_by_path_when_scores_equal() { + let mut matches = vec![ + (100, "b_path".to_string()), + (100, "a_path".to_string()), + (90, "zzz".to_string()), + ]; + + sort_matches(&mut matches); + + // Highest score first; ties broken alphabetically. + let expected = vec![ + (100, "a_path".to_string()), + (100, "b_path".to_string()), + (90, "zzz".to_string()), + ]; + + assert_eq!(matches, expected); + } }