zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-07-25 06:50:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug introduced by #13479 (#13516)

Browse Source 
Fixes a bug introduced by
https://github.com/zed-industries/zed/pull/13479 where dot files might
not be processed in the correct order.

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2024-06-25 10:03:29 -07:00 committed by GitHub
parent 0b1a589183
commit b2a0a7fa3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/worktree/src/worktree.rs
View File

@ -3826,7 +3826,8 @@ impl BackgroundScanner {
.await;
// Ensure that .git and .gitignore are processed first.
child_paths.sort_unstable();
swap_to_front(&mut child_paths, *GITIGNORE);
swap_to_front(&mut child_paths, *DOT_GIT);
for child_abs_path in child_paths {
let child_abs_path: Arc<Path> = child_abs_path.into();
@ -4620,6 +4621,16 @@ impl BackgroundScanner {
}
}
fn swap_to_front(child_paths: &mut Vec<PathBuf>, file: &OsStr) {
let position = child_paths
.iter()
.position(|path| path.file_name().unwrap() == file);
if let Some(position) = position {
let temp = child_paths.remove(position);
child_paths.insert(0, temp);
}
}
fn char_bag_for_path(root_char_bag: CharBag, path: &Path) -> CharBag {
let mut result = root_char_bag;
result.extend(