TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update diagnostics correctly on LSP exit (#7111)

Browse source 
* chore: avoid format! call with argument when useless

* feat: also clear diagnostics for unopened documents when exiting an LSP

* feat: we already worked on `self.editor.diagnostics` no need to redo the checks
This commit is contained in:
Poliorcetics 2023-05-23 12:33:01 +02:00 committed by GitHub
parent 6043c3c3db
commit 8e2660b5cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
helix-term/src/application.rs
View file

@ -964,22 +964,18 @@ impl Application {
Notification::Exit => { Notification::Exit => {
self.editor.set_status("Language server exited"); self.editor.set_status("Language server exited");
// Clear any diagnostics for documents with this server open. // LSPs may produce diagnostics for files that haven't been opened in helix,
let urls: Vec<_> = self // we need to clear those and remove the entries from the list if this leads to
.editor // an empty diagnostic list for said files
.documents_mut() for diags in self.editor.diagnostics.values_mut() {
.filter_map(|doc| { diags.retain(|(_, lsp_id)| *lsp_id != server_id);
if doc.supports_language_server(server_id) { }
doc.clear_diagnostics(server_id);
doc.url()
} else {
None
}
})
.collect();
for url in urls { self.editor.diagnostics.retain(|_, diags| !diags.is_empty());
self.editor.diagnostics.remove(&url);
// Clear any diagnostics for documents with this server open.
for doc in self.editor.documents_mut() {
doc.clear_diagnostics(server_id);
} }
// Remove the language server from the registry. // Remove the language server from the registry.

2
helix-term/src/ui/statusline.rs
View file

@ -275,7 +275,7 @@ where
}); });
if warnings > 0 || errors > 0 { if warnings > 0 || errors > 0 {
write(context, format!(" {} ", "W"), None); write(context, " W ".into(), None);
} }
if warnings > 0 { if warnings > 0 {