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

ssh-remoting: Fix go to definition out of worktree (#18094)

Browse source 
Release Notes:

- ssh-remoting: Fixed go to definition outside of worktree

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Conrad Irwin 2024-09-19 14:04:46 -06:00 • committed by GitHub
parent 00b1c81c9f
commit fbbf0393cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 251 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -534,6 +534,9 @@ impl LspStore {
}
WorktreeStoreEvent::WorktreeRemoved(_, id) => self.remove_worktree(*id, cx),
WorktreeStoreEvent::WorktreeOrderChanged => {}
WorktreeStoreEvent::WorktreeUpdateSent(worktree) => {
worktree.update(cx, |worktree, _cx| self.send_diagnostic_summaries(worktree));
}
}
}
@ -764,24 +767,22 @@ impl LspStore {
self.active_entry = active_entry;
}
pub(crate) fn send_diagnostic_summaries(
&self,
worktree: &mut Worktree,
) -> Result<(), anyhow::Error> {
pub(crate) fn send_diagnostic_summaries(&self, worktree: &mut Worktree) {
if let Some(client) = self.downstream_client.clone() {
if let Some(summaries) = self.diagnostic_summaries.get(&worktree.id()) {
for (path, summaries) in summaries {
for (&server_id, summary) in summaries {
client.send(proto::UpdateDiagnosticSummary {
project_id: self.project_id,
worktree_id: worktree.id().to_proto(),
summary: Some(summary.to_proto(server_id, path)),
})?;
client
.send(proto::UpdateDiagnosticSummary {
project_id: self.project_id,
worktree_id: worktree.id().to_proto(),
summary: Some(summary.to_proto(server_id, path)),
})
.log_err();
}
}
}
}
Ok(())
}
pub fn request_lsp<R: LspCommand>(