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

Introduce LocalFile trait

Browse source 
If you want to call `abs_path` or `load`, the file needs to be local. You call `as_local` which returns `Option<dyn LocalFile>` with those local-only methods. I think this makes it more explicit what works only locally vs everywhere.
This commit is contained in:
Nathan Sobo 2022-01-22 15:52:14 -07:00
parent ea9c5b0686
commit 66fce5ec8e
3 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -938,7 +938,7 @@ impl Project {
let buffer_abs_path;
if let Some(file) = File::from_dyn(buffer.file()) {
worktree = file.worktree.clone();
buffer_abs_path = file.abs_path(cx);
buffer_abs_path = file.as_local().map(|f| f.abs_path(cx));
} else {
return Task::ready(Err(anyhow!("buffer does not belong to any worktree")));
};
@ -2181,8 +2181,8 @@ mod tests {
cx.update(|cx| {
let target_buffer = definition.target_buffer.read(cx);
assert_eq!(
target_buffer.file().unwrap().abs_path(cx),
Some(dir.path().join("a.rs"))
target_buffer.file().unwrap().as_local().unwrap().abs_path(cx),
dir.path().join("a.rs")
);
assert_eq!(definition.target_range.to_offset(target_buffer), 9..10);
assert_eq!(