mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-19 02:17:35 +03:00
project search: Fix filtering when buffers are open (#16997)
This fixes a little bug that has snuck in #16923 Release Notes: - N/A
This commit is contained in:
parent
a5b82b2bf3
commit
4e67d33d88
@ -471,17 +471,6 @@ impl WorktreeStore {
|
||||
continue;
|
||||
}
|
||||
|
||||
if open_entries.contains(&entry.id) {
|
||||
let (mut tx, rx) = oneshot::channel();
|
||||
tx.send(ProjectPath {
|
||||
worktree_id: snapshot.id(),
|
||||
path: entry.path.clone(),
|
||||
})
|
||||
.await?;
|
||||
output_tx.send(rx).await?;
|
||||
continue;
|
||||
}
|
||||
|
||||
if query.filters_path() {
|
||||
let matched_path = if include_root {
|
||||
let mut full_path = PathBuf::from(snapshot.root_name());
|
||||
@ -495,8 +484,15 @@ impl WorktreeStore {
|
||||
}
|
||||
}
|
||||
|
||||
let (tx, rx) = oneshot::channel();
|
||||
output_tx.send(rx).await?;
|
||||
let (mut tx, rx) = oneshot::channel();
|
||||
|
||||
if open_entries.contains(&entry.id) {
|
||||
tx.send(ProjectPath {
|
||||
worktree_id: snapshot.id(),
|
||||
path: entry.path.clone(),
|
||||
})
|
||||
.await?;
|
||||
} else {
|
||||
filter_tx
|
||||
.send(MatchingEntry {
|
||||
respond: tx,
|
||||
@ -508,6 +504,9 @@ impl WorktreeStore {
|
||||
})
|
||||
.await?;
|
||||
}
|
||||
|
||||
output_tx.send(rx).await?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user