mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-27 16:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix handling of redundant buffer creation messages on guests

Browse source 
Check if the buffer already exists *before* overwriting it.
Ignore redundant registrations on remote projects.

Co-authored-by: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-04-06 12:17:25 -07:00
parent 22a6a243bc
commit aa7918c4b5
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1488,32 +1488,29 @@ impl Project {
}); });
let remote_id = buffer.read(cx).remote_id(); let remote_id = buffer.read(cx).remote_id();
let open_buffer = if self.is_remote() || self.is_shared() { let is_remote = self.is_remote();
let open_buffer = if is_remote || self.is_shared() {
OpenBuffer::Strong(buffer.clone()) OpenBuffer::Strong(buffer.clone())
} else { } else {
OpenBuffer::Weak(buffer.downgrade()) OpenBuffer::Weak(buffer.downgrade())
}; };
match self.opened_buffers.insert(remote_id, open_buffer) { match self.opened_buffers.entry(remote_id) {
None => {} hash_map::Entry::Vacant(entry) => {
Some(OpenBuffer::Operations(operations)) => { entry.insert(open_buffer);
buffer.update(cx, |buffer, cx| buffer.apply_ops(operations, cx))?
} }
Some(OpenBuffer::Weak(existing_handle)) => { hash_map::Entry::Occupied(mut entry) => {
if existing_handle.upgrade(cx).is_some() { if let OpenBuffer::Operations(operations) = entry.get_mut() {
debug_panic!("already registered buffer with remote id {}", remote_id); buffer.update(cx, |b, cx| b.apply_ops(operations.drain(..), cx))?;
Err(anyhow!( } else if entry.get().upgrade(cx).is_some() {
"already registered buffer with remote id {}", if is_remote {
remote_id return Ok(());
))? } else {
debug_panic!("buffer {} was already registered", remote_id);
Err(anyhow!("buffer {} was already registered", remote_id))?;
}
} }
} entry.insert(open_buffer);
Some(OpenBuffer::Strong(_)) => {
debug_panic!("already registered buffer with remote id {}", remote_id);
Err(anyhow!(
"already registered buffer with remote id {}",
remote_id
))?
} }
} }
cx.subscribe(buffer, |this, buffer, event, cx| { cx.subscribe(buffer, |this, buffer, event, cx| {