kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Refactor doc.shown_diagnostics to avoid an extra HashSet

Browse source 
Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
This commit is contained in:
Philipp Mildenberger 2023-03-18 21:10:10 +01:00
parent 1122928c2a
commit 9639f42766
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
helix-view/src/document.rs
View file

@ -16,7 +16,7 @@ use serde::de::{self, Deserialize, Deserializer};
use serde::Serialize; use serde::Serialize;
use std::borrow::Cow; use std::borrow::Cow;
use std::cell::Cell; use std::cell::Cell;
use std::collections::{HashMap, HashSet}; use std::collections::HashMap;
use std::fmt::Display; use std::fmt::Display;
use std::future::Future; use std::future::Future;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
@ -1581,13 +1581,16 @@ impl Document {
} }
pub fn shown_diagnostics(&self) -> impl Iterator<Item = &Diagnostic> + DoubleEndedIterator { pub fn shown_diagnostics(&self) -> impl Iterator<Item = &Diagnostic> + DoubleEndedIterator {
let ls_ids: HashSet<_> = self self.diagnostics.iter().filter(|d| {
.language_servers_with_feature(LanguageServerFeature::Diagnostics) self.language_servers()
.map(|ls| ls.id()) .find(|ls| ls.id() == d.language_server_id)
.collect(); .and_then(|ls| {
self.diagnostics let config = self.language_config()?;
.iter() let features = config.language_servers.get(ls.name())?;
.filter(move |d| ls_ids.contains(&d.language_server_id)) Some(features.has_feature(LanguageServerFeature::Diagnostics))
})
== Some(true)
})
} }
pub fn replace_diagnostics( pub fn replace_diagnostics(