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

Properly register buffers with reused language servers (#32057)

Browse source 
Follow-up of https://github.com/zed-industries/zed/pull/30707

The old code does something odd, re-accessing essentially the same
adapter-server pair for every language server initialized; but that was
done before for "incorrect", non-reused worktree_id hence never resulted
in external worktrees' files registration in this code path.

Release Notes:

- Fixed certain external worktrees' files sometimes not registered with
language servers
This commit is contained in:
Kirill Bulatov 2025-06-04 12:59:57 +03:00 • committed by GitHub
parent f9257b0efe
commit 5e38915d45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2308,7 +2308,7 @@ impl LocalLspStore {
}); });
(false, lsp_delegate, servers) (false, lsp_delegate, servers)
}); });
let servers = servers let servers_and_adapters = servers
.into_iter() .into_iter()
.filter_map(|server_node| { .filter_map(|server_node| {
if reused && server_node.server_id().is_none() { if reused && server_node.server_id().is_none() {
@ -2384,14 +2384,14 @@ impl LocalLspStore {
}, },
)?; )?;
let server_state = self.language_servers.get(&server_id)?; let server_state = self.language_servers.get(&server_id)?;
if let LanguageServerState::Running { server, .. } = server_state { if let LanguageServerState::Running { server, adapter, .. } = server_state {
Some(server.clone()) Some((server.clone(), adapter.clone()))
} else { } else {
None None
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
for server in servers { for (server, adapter) in servers_and_adapters {
buffer_handle.update(cx, |buffer, cx| { buffer_handle.update(cx, |buffer, cx| {
buffer.set_completion_triggers( buffer.set_completion_triggers(
server.server_id(), server.server_id(),
@ -2409,47 +2409,26 @@ impl LocalLspStore {
cx, cx,
); );
}); });
}
for adapter in self.languages.lsp_adapters(&language.name()) { let snapshot = LspBufferSnapshot {
let servers = self version: 0,
.language_server_ids snapshot: initial_snapshot.clone(),
.get(&(worktree_id, adapter.name.clone()))
.map(|ids| {
ids.iter().flat_map(|id| {
self.language_servers.get(id).and_then(|server_state| {
if let LanguageServerState::Running { server, .. } = server_state {
Some(server.clone())
} else {
None
}
})
})
});
let servers = match servers {
Some(server) => server,
None => continue,
}; };
for server in servers { self.buffer_snapshots
let snapshot = LspBufferSnapshot { .entry(buffer_id)
version: 0, .or_default()
snapshot: initial_snapshot.clone(), .entry(server.server_id())
}; .or_insert_with(|| {
self.buffer_snapshots server.register_buffer(
.entry(buffer_id) uri.clone(),
.or_default() adapter.language_id(&language.name()),
.entry(server.server_id()) 0,
.or_insert_with(|| { initial_snapshot.text(),
server.register_buffer( );
uri.clone(),
adapter.language_id(&language.name()),
0,
initial_snapshot.text(),
);
vec![snapshot] vec![snapshot]
}); });
}
} }
} }