Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restructure Worktree to index entries by path

Browse source
This commit is contained in:
Antonio Scandurra 2021-04-23 11:22:25 +02:00
parent ae5f02d2e9
commit 8f2fc079fd
2 changed files with 269 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

706
zed/src/worktree.rs
View file

File diff suppressed because it is too large Load diff

8
zed/src/worktree/fuzzy.rs
View file

@ -124,7 +124,10 @@ where
snapshot.visible_files(start).take(end - start)
};
let path_entries = entries.map(|entry| {
if let Entry::File { path, .. } = entry {
if let Entry::File {
path_entry: path, ..
} = entry
{
path
} else {
unreachable!()
@ -133,7 +136,7 @@ where
let skipped_prefix_len = if include_root_name {
0
} else if let Some(Entry::Dir { .. }) = snapshot.root_entry() {
} else if let Entry::Dir { .. } = snapshot.root_entry() {
if let Some(name) = snapshot.root_name() {
name.to_string_lossy().chars().count() + 1
} else {
@ -514,7 +517,6 @@ mod tests {
id: 0,
scan_id: 0,
path: PathBuf::new().into(),
root_inode: None,
ignores: Default::default(),
entries: Default::default(),
},