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

Skip ignored entries when recording worktree extensions

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-06-29 17:00:16 +02:00
parent 639cd71a3b
commit d1cdacdf14
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/project/src/worktree.rs
View file

@ -1455,9 +1455,9 @@ impl LocalSnapshot {
); );
if let Some(removed_entry) = removed_entry { if let Some(removed_entry) = removed_entry {
self.dec_extension_count(&removed_entry.path); self.dec_extension_count(&removed_entry.path, removed_entry.is_ignored);
} }
self.inc_extension_count(&entry.path); self.inc_extension_count(&entry.path, entry.is_ignored);
entry entry
} }
@ -1494,7 +1494,7 @@ impl LocalSnapshot {
for mut entry in entries { for mut entry in entries {
self.reuse_entry_id(&mut entry); self.reuse_entry_id(&mut entry);
self.inc_extension_count(&entry.path); self.inc_extension_count(&entry.path, entry.is_ignored);
entries_by_id_edits.push(Edit::Insert(PathEntry { entries_by_id_edits.push(Edit::Insert(PathEntry {
id: entry.id, id: entry.id,
path: entry.path.clone(), path: entry.path.clone(),
@ -1508,24 +1508,28 @@ impl LocalSnapshot {
let removed_entries = self.entries_by_id.edit(entries_by_id_edits, &()); let removed_entries = self.entries_by_id.edit(entries_by_id_edits, &());
for removed_entry in removed_entries { for removed_entry in removed_entries {
self.dec_extension_count(&removed_entry.path); self.dec_extension_count(&removed_entry.path, removed_entry.is_ignored);
} }
} }
fn inc_extension_count(&mut self, path: &Path) { fn inc_extension_count(&mut self, path: &Path, ignored: bool) {
if let Some(extension) = path.extension() { if !ignored {
if let Some(count) = self.extension_counts.get_mut(extension) { if let Some(extension) = path.extension() {
*count += 1; if let Some(count) = self.extension_counts.get_mut(extension) {
} else { *count += 1;
self.extension_counts.insert(extension.into(), 1); } else {
self.extension_counts.insert(extension.into(), 1);
}
} }
} }
} }
fn dec_extension_count(&mut self, path: &Path) { fn dec_extension_count(&mut self, path: &Path, ignored: bool) {
if let Some(extension) = path.extension() { if !ignored {
if let Some(count) = self.extension_counts.get_mut(extension) { if let Some(extension) = path.extension() {
*count -= 1; if let Some(count) = self.extension_counts.get_mut(extension) {
*count -= 1;
}
} }
} }
} }
@ -1557,7 +1561,7 @@ impl LocalSnapshot {
.or_insert(entry.id); .or_insert(entry.id);
*removed_entry_id = cmp::max(*removed_entry_id, entry.id); *removed_entry_id = cmp::max(*removed_entry_id, entry.id);
entries_by_id_edits.push(Edit::Remove(entry.id)); entries_by_id_edits.push(Edit::Remove(entry.id));
self.dec_extension_count(&entry.path); self.dec_extension_count(&entry.path, entry.is_ignored);
} }
self.entries_by_id.edit(entries_by_id_edits, &()); self.entries_by_id.edit(entries_by_id_edits, &());