andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-25 02:46:17 +04:00
Code Issues Projects Releases Wiki Activity

Simplify 'lsp_stop' command

Browse Source
This commit is contained in:
Philipp Mildenberger 2023-03-19 19:26:39 +01:00
parent 7d20740b5b
commit 58c913ce45
2 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
helix-term/src/commands/typed.rs
View File

@ -1442,62 +1442,19 @@ fn lsp_stop(
return Ok(());
}
let doc = doc!(cx.editor);
// TODO this stops language servers which may be used in another doc/language type that uses the same language servers
// I'm not sure if this is really what we want
let ls_shutdown_names = doc
let ls_shutdown_names = doc!(cx.editor)
.language_servers()
.map(|ls| ls.name())
.map(|ls| ls.name().to_string())
.collect::<Vec<_>>();
for ls_name in &ls_shutdown_names {
cx.editor.language_servers.stop(ls_name);
}
let doc_ids_active_clients: Vec<_> = cx
.editor
.documents()
.filter_map(|doc| {
let doc_active_ls_ids: Vec<_> = doc
.language_servers()
.filter(|ls| !ls_shutdown_names.contains(&ls.name()))
.map(|ls| ls.id())
.collect();
let active_clients: Vec<_> = cx
.editor
.language_servers
.iter_clients()
.filter(|client| doc_active_ls_ids.contains(&client.id()))
.map(Clone::clone)
.collect();
if active_clients.len() != doc.language_servers().count() {
Some((doc.id(), active_clients))
} else {
None
for doc in cx.editor.documents_mut() {
if let Some(client) = doc.remove_language_server_by_name(ls_name) {
doc.clear_diagnostics(client.id());
}
})
.collect();
for (doc_id, active_clients) in doc_ids_active_clients {
let doc = cx.editor.documents.get_mut(&doc_id).unwrap();
let stopped_clients: Vec<_> = doc
.language_servers()
.filter(|ls| {
!active_clients
.iter()
.any(|active_ls| active_ls.id() == ls.id())
})
.map(|ls| ls.id())
.collect(); // is necessary because of borrow-checking
for client_id in stopped_clients {
doc.clear_diagnostics(client_id)
}
doc.set_language_servers(active_clients);
}
Ok(())

7
helix-view/src/document.rs
View File

@ -1442,6 +1442,13 @@ pub fn language_servers(&self) -> impl Iterator<Item = &helix_lsp::Client> {
.filter_map(|l| if l.is_initialized() { Some(&**l) } else { None })
}
pub fn remove_language_server_by_name(&mut self, name: &str) -> Option<Arc<Client>> {
match self.language_servers.iter().position(|l| l.name() == name) {
Some(index) => Some(self.language_servers.remove(index)),
None => None,
}
}
// TODO filter also based on LSP capabilities?
pub fn language_servers_with_feature(
&self,