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

Always open buffers via the project

Browse source
This commit is contained in:
Max Brunsfeld 2022-01-19 14:48:54 -08:00
parent f43dcd6763
commit 0992132a0d
4 changed files with 53 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1088,26 +1088,51 @@ impl Project {
rpc: Arc<Client>,
cx: &mut ModelContext<Self>,
) -> anyhow::Result<()> {
let receipt = envelope.receipt();
let peer_id = envelope.original_sender_id()?;
let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
if let Some(worktree) = self.worktree_for_id(worktree_id, cx) {
return worktree.update(cx, |worktree, cx| {
worktree.handle_open_buffer(envelope, rpc, cx)
});
} else {
Err(anyhow!("no such worktree"))
}
let worktree = self
.worktree_for_id(worktree_id, cx)
.ok_or_else(|| anyhow!("no such worktree"))?;
let task = self.open_buffer(
ProjectPath {
worktree_id,
path: PathBuf::from(envelope.payload.path).into(),
},
cx,
);
cx.spawn(|_, mut cx| {
async move {
let buffer = task.await?;
let response = worktree.update(&mut cx, |worktree, cx| {
worktree
.as_local_mut()
.unwrap()
.open_remote_buffer(peer_id, buffer, cx)
});
rpc.respond(receipt, response).await?;
Ok(())
}
.log_err()
})
.detach();
Ok(())
}
pub fn handle_close_buffer(
&mut self,
envelope: TypedEnvelope<proto::CloseBuffer>,
rpc: Arc<Client>,
_: Arc<Client>,
cx: &mut ModelContext<Self>,
) -> anyhow::Result<()> {
let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
if let Some(worktree) = self.worktree_for_id(worktree_id, cx) {
worktree.update(cx, |worktree, cx| {
worktree.handle_close_buffer(envelope, rpc, cx)
worktree
.as_local_mut()
.unwrap()
.close_remote_buffer(envelope, cx)
})?;
}
Ok(())

68
crates/project/src/worktree.rs
View file

@ -286,43 +286,6 @@ impl Worktree {
}
}
pub fn handle_open_buffer(
&mut self,
envelope: TypedEnvelope<proto::OpenBuffer>,
rpc: Arc<Client>,
cx: &mut ModelContext<Self>,
) -> anyhow::Result<()> {
let receipt = envelope.receipt();
let response = self
.as_local_mut()
.unwrap()
.open_remote_buffer(envelope, cx);
cx.background()
.spawn(
async move {
rpc.respond(receipt, response.await?).await?;
Ok(())
}
.log_err(),
)
.detach();
Ok(())
}
pub fn handle_close_buffer(
&mut self,
envelope: TypedEnvelope<proto::CloseBuffer>,
_: Arc<Client>,
cx: &mut ModelContext<Self>,
) -> anyhow::Result<()> {
self.as_local_mut()
.unwrap()
.close_remote_buffer(envelope, cx)
}
pub fn diagnostic_summaries<'a>(
&'a self,
) -> impl Iterator<Item = (Arc<Path>, DiagnosticSummary)> + 'a {
@ -1006,28 +969,17 @@ impl LocalWorktree {
pub fn open_remote_buffer(
&mut self,
envelope: TypedEnvelope<proto::OpenBuffer>,
peer_id: PeerId,
buffer: ModelHandle<Buffer>,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<proto::OpenBufferResponse>> {
cx.spawn(|this, mut cx| async move {
let peer_id = envelope.original_sender_id();
let path = Path::new(&envelope.payload.path);
let (buffer, _) = this
.update(&mut cx, |this, cx| this.open_buffer(path, cx))
.await?;
this.update(&mut cx, |this, cx| {
this.as_local_mut()
.unwrap()
.shared_buffers
.entry(peer_id?)
.or_default()
.insert(buffer.id() as u64, buffer.clone());
Ok(proto::OpenBufferResponse {
buffer: Some(buffer.update(cx.as_mut(), |buffer, _| buffer.to_proto())),
})
})
})
) -> proto::OpenBufferResponse {
self.shared_buffers
.entry(peer_id)
.or_default()
.insert(buffer.id() as u64, buffer.clone());
proto::OpenBufferResponse {
buffer: Some(buffer.update(cx.as_mut(), |buffer, _| buffer.to_proto())),
}
}
pub fn close_remote_buffer(