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

Merge branch 'main' into reconnections-2

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-05 19:18:40 +01:00
commit 9a62150dce
86 changed files with 7454 additions and 2211 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/project/src/project.rs
View file

@ -65,7 +65,6 @@ use std::{
use thiserror::Error;
use util::{defer, post_inc, ResultExt, TryFutureExt as _};
pub use db::Db;
pub use fs::*;
pub use worktree::*;
@ -758,6 +757,7 @@ impl Project {
&self.collaborators
}
/// Collect all worktrees, including ones that don't appear in the project panel
pub fn worktrees<'a>(
&'a self,
cx: &'a AppContext,
@ -767,6 +767,7 @@ impl Project {
.filter_map(move |worktree| worktree.upgrade(cx))
}
/// Collect all user-visible worktrees, the ones that appear in the project panel
pub fn visible_worktrees<'a>(
&'a self,
cx: &'a AppContext,