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

Rebuild buffer store to be aware of remote/local distinction (#18303)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Conrad Irwin 2024-09-24 15:52:30 -06:00 • committed by GitHub
parent da1ef13442
commit c4e0f5e0ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 1127 additions and 826 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/project/src/lsp_store.rs
View file

@ -1601,19 +1601,19 @@ impl LspStore {
buffer_id: buffer_handle.read(cx).remote_id().into(),
action: Some(Self::serialize_code_action(&action)),
};
cx.spawn(move |this, cx| async move {
let buffer_store = self.buffer_store();
cx.spawn(move |_, mut cx| async move {
let response = upstream_client
.request(request)
.await?
.transaction
.ok_or_else(|| anyhow!("missing transaction"))?;
BufferStore::deserialize_project_transaction(
this.read_with(&cx, |this, _| this.buffer_store.downgrade())?,
response,
push_to_history,
cx,
)
.await
buffer_store
.update(&mut cx, |buffer_store, cx| {
buffer_store.deserialize_project_transaction(response, push_to_history, cx)
})?
.await
})
} else {
let buffer = buffer_handle.read(cx);
@ -5062,6 +5062,7 @@ impl LspStore {
.spawn(this.languages.language_for_name(language_name.0.as_ref()))
.detach();
// host
let adapter = this.languages.get_or_register_lsp_adapter(
language_name.clone(),
server_name.clone(),
@ -5259,7 +5260,8 @@ impl LspStore {
result
})
} else if let Some((client, project_id)) = self.upstream_client() {
cx.spawn(move |this, mut cx| async move {
let buffer_store = self.buffer_store();
cx.spawn(move |_, mut cx| async move {
let response = client
.request(proto::FormatBuffers {
project_id,
@ -5274,13 +5276,12 @@ impl LspStore {
.await?
.transaction
.ok_or_else(|| anyhow!("missing transaction"))?;
BufferStore::deserialize_project_transaction(
this.read_with(&cx, |this, _| this.buffer_store.downgrade())?,
response,
push_to_history,
cx,
)
.await
buffer_store
.update(&mut cx, |buffer_store, cx| {
buffer_store.deserialize_project_transaction(response, push_to_history, cx)
})?
.await
})
} else {
Task::ready(Ok(ProjectTransaction::default()))