diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs index 9719e4d1212..493ba563d59 100644 --- a/crates/util/src/paths.rs +++ b/crates/util/src/paths.rs @@ -1103,6 +1103,16 @@ fn natural_sort_no_tiebreak(a: &str, b: &str) -> Ordering { } } +fn compare_lowercase(a: &str, b: &str) -> Ordering { + if a.is_ascii() && b.is_ascii() { + a.bytes() + .map(|byte| byte.to_ascii_lowercase()) + .cmp(b.bytes().map(|byte| byte.to_ascii_lowercase())) + } else { + a.to_lowercase().cmp(&b.to_lowercase()) + } +} + fn stem_and_extension(filename: &str) -> (Option<&str>, Option<&str>) { if filename.is_empty() { return (None, None); @@ -1249,10 +1259,8 @@ pub fn compare_rel_paths_by( if order == SortOrder::Extension { // Directories have no extension and must take part in this comparison too, // otherwise mixed mode would produce an inconsistent (non-transitive) ordering. - let extension_ordering = a_ext - .unwrap_or_default() - .to_lowercase() - .cmp(&b_ext.unwrap_or_default().to_lowercase()); + let extension_ordering = + compare_lowercase(a_ext.unwrap_or_default(), b_ext.unwrap_or_default()); if !extension_ordering.is_eq() { return extension_ordering; }