mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 20:29:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

project_panel: Fix the confusing display when files or directories have the same name in a case-insensitive comparison (#19211)

Browse source 
- Closes #18851

Release Notes:

- Fixed directory name comparison on Linux not considering the case
([#18851](https://github.com/zed-industries/zed/issues/18851))
This commit is contained in:
wannacu 2024-10-23 15:37:57 +08:00 committed by GitHub
parent 6c7e79eff6
commit d53a86b01d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/util/src/paths.rs
View file

@ -433,6 +433,38 @@ mod tests {
);
}
#[test]
fn compare_paths_case_semi_sensitive() {
let mut paths = vec![
(Path::new("test_DIRS"), false),
(Path::new("test_DIRS/foo_1"), true),
(Path::new("test_DIRS/foo_2"), true),
(Path::new("test_DIRS/bar"), true),
(Path::new("test_DIRS/BAR"), true),
(Path::new("test_dirs"), false),
(Path::new("test_dirs/foo_1"), true),
(Path::new("test_dirs/foo_2"), true),
(Path::new("test_dirs/bar"), true),
(Path::new("test_dirs/BAR"), true),
];
paths.sort_by(|&a, &b| compare_paths(a, b));
assert_eq!(
paths,
vec![
(Path::new("test_dirs"), false),
(Path::new("test_dirs/bar"), true),
(Path::new("test_dirs/BAR"), true),
(Path::new("test_dirs/foo_1"), true),
(Path::new("test_dirs/foo_2"), true),
(Path::new("test_DIRS"), false),
(Path::new("test_DIRS/bar"), true),
(Path::new("test_DIRS/BAR"), true),
(Path::new("test_DIRS/foo_1"), true),
(Path::new("test_DIRS/foo_2"), true),
]
);
}
#[test]
fn path_with_position_parse_posix_path() {
// Test POSIX filename edge cases

15
crates/util/src/util.rs
View file

@ -659,15 +659,22 @@ impl<'a> NumericPrefixWithSuffix<'a> {
Self(prefix, remainder)
}
}
/// When dealing with equality, we need to consider the case of the strings to achieve strict equality
/// to handle cases like "a" < "A" instead of "a" == "A".
impl Ord for NumericPrefixWithSuffix<'_> {
fn cmp(&self, other: &Self) -> Ordering {
match (self.0, other.0) {
(None, None) => UniCase::new(self.1).cmp(&UniCase::new(other.1)),
(None, None) => UniCase::new(self.1)
.cmp(&UniCase::new(other.1))
.then_with(|| self.1.cmp(other.1).reverse()),
(None, Some(_)) => Ordering::Greater,
(Some(_), None) => Ordering::Less,
(Some(a), Some(b)) => a
.cmp(&b)
.then_with(|| UniCase::new(self.1).cmp(&UniCase::new(other.1))),
(Some(a), Some(b)) => a.cmp(&b).then_with(|| {
UniCase::new(self.1)
.cmp(&UniCase::new(other.1))
.then_with(|| self.1.cmp(other.1).reverse())
}),
}
}
}