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

Load diff base from correct relative path

Browse source
This commit is contained in:
Julia 2022-10-04 20:42:01 -04:00
parent 836b536a90
commit 3f4be5521c
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4673,13 +4673,18 @@ impl Project {
None => return,
};
let relative_repo = match path.strip_prefix(repo.content_path) {
Ok(relative_repo) => relative_repo.to_owned(),
Err(_) => return,
};
let shared_remote_id = self.shared_remote_id();
let client = self.client.clone();
cx.spawn(|_, mut cx| async move {
let diff_base = cx
.background()
.spawn(async move { repo.repo.lock().load_index(&path) })
.spawn(async move { repo.repo.lock().load_index(&relative_repo) })
.await;
let buffer_id = buffer.update(&mut cx, |buffer, cx| {