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

Handle file and diff updates to incomplete buffers

Browse source 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-12-21 15:39:57 -08:00
parent c321f5d94a
commit d750b02a7c
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5034,14 +5034,14 @@ impl Project {
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
let buffer_id = envelope.payload.buffer_id; let buffer_id = envelope.payload.buffer_id;
let diff_base = envelope.payload.diff_base; let diff_base = envelope.payload.diff_base;
let buffer = this if let Some(buffer) = this
.opened_buffers .opened_buffers
.get_mut(&buffer_id) .get_mut(&buffer_id)
.and_then(|b| b.upgrade(cx)) .and_then(|b| b.upgrade(cx))
.ok_or_else(|| anyhow!("No such buffer {}", buffer_id))?; .or_else(|| this.incomplete_buffers.get(&buffer_id).cloned())
{
buffer.update(cx, |buffer, cx| buffer.set_diff_base(diff_base, cx)); buffer.update(cx, |buffer, cx| buffer.set_diff_base(diff_base, cx));
}
Ok(()) Ok(())
}) })
} }
@ -5055,20 +5055,22 @@ impl Project {
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
let payload = envelope.payload.clone(); let payload = envelope.payload.clone();
let buffer_id = payload.buffer_id; let buffer_id = payload.buffer_id;
let file = payload.file.ok_or_else(|| anyhow!("invalid file"))?; if let Some(buffer) = this
let worktree = this
.worktree_for_id(WorktreeId::from_proto(file.worktree_id), cx)
.ok_or_else(|| anyhow!("no such worktree"))?;
let file = File::from_proto(file, worktree, cx)?;
let buffer = this
.opened_buffers .opened_buffers
.get_mut(&buffer_id) .get_mut(&buffer_id)
.and_then(|b| b.upgrade(cx)) .and_then(|b| b.upgrade(cx))
.ok_or_else(|| anyhow!("no such buffer"))?; .or_else(|| this.incomplete_buffers.get(&buffer_id).cloned())
buffer.update(cx, |buffer, cx| { {
buffer.file_updated(Arc::new(file), cx).detach(); let file = payload.file.ok_or_else(|| anyhow!("invalid file"))?;
}); let worktree = this
this.assign_language_to_buffer(&buffer, cx); .worktree_for_id(WorktreeId::from_proto(file.worktree_id), cx)
.ok_or_else(|| anyhow!("no such worktree"))?;
let file = File::from_proto(file, worktree, cx)?;
buffer.update(cx, |buffer, cx| {
buffer.file_updated(Arc::new(file), cx).detach();
});
this.assign_language_to_buffer(&buffer, cx);
}
Ok(()) Ok(())
}) })
} }