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

Introduce a WorktreeId struct, fix incorrect use of remote worktrees' handle id

Browse source
This commit is contained in:
Max Brunsfeld 2022-01-03 19:03:48 -08:00 • committed by Antonio Scandurra
parent 7f8e76e0f1
commit a4027aacb5
6 changed files with 112 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/file_finder/src/file_finder.rs
View file

@ -12,7 +12,7 @@ use gpui::{
ViewContext, ViewHandle, WeakViewHandle,
};
use postage::watch;
use project::{Project, ProjectPath};
use project::{Project, ProjectPath, WorktreeId};
use std::{
cmp,
path::Path,
@ -195,7 +195,7 @@ impl FileFinder {
.with_style(style.container);
let action = Select(ProjectPath {
worktree_id: path_match.worktree_id,
worktree_id: WorktreeId::from_usize(path_match.worktree_id),
path: path_match.path.clone(),
});
EventHandler::new(container.boxed())
@ -370,7 +370,7 @@ impl FileFinder {
fn confirm(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) {
if let Some(m) = self.matches.get(self.selected_index()) {
cx.emit(Event::Selected(ProjectPath {
worktree_id: m.worktree_id,
worktree_id: WorktreeId::from_usize(m.worktree_id),
path: m.path.clone(),
}));
}