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

Get integration tests passing

Browse source 
* Fix misuse of guest buffer's id as its remote id

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-01-21 17:44:24 -08:00
parent f1fc0bde99
commit 2712cadaf6
3 changed files with 35 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -427,7 +427,7 @@ impl Project {
for worktree in this.worktrees(cx).collect::<Vec<_>>() {
worktree.update(cx, |worktree, cx| {
let worktree = worktree.as_local_mut().unwrap();
tasks.push(worktree.share(cx));
tasks.push(worktree.share(project_id, cx));
});
}
});
@ -526,12 +526,14 @@ impl Project {
cx.spawn(move |this, mut cx| async move {
let load_result = load_buffer.await;
*tx.borrow_mut() = Some(this.update(&mut cx, |this, _| {
*tx.borrow_mut() = Some(this.update(&mut cx, |this, cx| {
// Record the fact that the buffer is no longer loading.
this.loading_buffers.remove(&path);
let buffer = load_result.map_err(Arc::new)?;
this.open_buffers
.insert(buffer.id(), OpenBuffer::Loaded(buffer.downgrade()));
this.open_buffers.insert(
buffer.read(cx).remote_id() as usize,
OpenBuffer::Loaded(buffer.downgrade()),
);
Ok((buffer, Arc::new(AtomicBool::new(true))))
}));
})
@ -1109,7 +1111,7 @@ impl Project {
if is_shared {
worktree
.update(&mut cx, |worktree, cx| {
worktree.as_local_mut().unwrap().share(cx)
worktree.as_local_mut().unwrap().share(project_id, cx)
})
.await?;
}