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

Rename entries via the project to prepare for guest support

Browse source 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2022-05-04 09:11:59 -06:00 • committed by Max Brunsfeld
parent 657ea264cc
commit 470d693d5e
3 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -704,13 +704,13 @@ impl LocalWorktree {
})
}
pub fn rename(
pub fn rename_entry(
&self,
old_path: impl Into<Arc<Path>>,
entry_id: ProjectEntryId,
new_path: impl Into<Arc<Path>>,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<Entry>> {
let old_path = old_path.into();
) -> Option<Task<Result<Entry>>> {
let old_path = self.entry_for_id(entry_id)?.path.clone();
let new_path = new_path.into();
let abs_old_path = self.absolutize(&old_path);
let abs_new_path = self.absolutize(&new_path);
@ -723,7 +723,7 @@ impl LocalWorktree {
}
});
cx.spawn(|this, mut cx| async move {
Some(cx.spawn(|this, mut cx| async move {
rename.await?;
let entry = this
.update(&mut cx, |this, _| {
@ -736,7 +736,7 @@ impl LocalWorktree {
.await?;
this.update(&mut cx, |this, cx| this.poll_snapshot(cx));
Ok(entry)
})
}))
}
fn refresh_entry(