git.iko.soy/helix
on master help sign in
Optimize gutter diagnostics and simplify shown_diagnostics
commit8ee599942a0e5ff6fa1a908ca076785e0d2bd0c7 authorPhilipp Mildenberger <philipp@mildenberger.me> dateMon 20 Mar 2023, 00:51 (4 years ago) parent8ab6d7b
2 files changed+16−15
compare with master
unifiedsplit
helix-view/src/document.rs+3−12 helix-view/src/gutter.rs+13−3
helix-view/src/document.rs+3−12
@@ -179,7 +179,7 @@ pub struct Document {
179179 version: i32, // should be usize?
180180 pub(crate) modified_since_accessed: bool,
181181
182− diagnostics: Vec<Diagnostic>,
182+ pub(crate) diagnostics: Vec<Diagnostic>,
183183 pub(crate) language_servers: HashMap<LanguageServerName, Arc<Client>>,
184184
185185 diff_handle: Option<DiffHandle>,
@@ -1605,17 +1605,8 @@ impl Document {
16051605
16061606 pub fn shown_diagnostics(&self) -> impl Iterator<Item = &Diagnostic> + DoubleEndedIterator {
16071607 self.diagnostics.iter().filter(|d| {
1608− self.language_servers()
1609− .find(|ls| ls.id() == d.language_server_id)
1610− .and_then(|ls| {
1611− let config = self.language_config()?;
1612− let features = config
1613− .language_servers
1614− .iter()
1615− .find(|features| features.name == ls.name())?;
1616− Some(features.has_feature(LanguageServerFeature::Diagnostics))
1617− })
1618− == Some(true)
1608+ self.language_servers_with_feature(LanguageServerFeature::Diagnostics)
1609+ .any(|ls| ls.id() == d.language_server_id)
16191610 })
16201611 }
16211612
helix-view/src/gutter.rs+13−3
@@ -1,5 +1,7 @@
11use std::fmt::Write;
22
3+use helix_core::{syntax::LanguageServerFeature, Diagnostic};
4+
35use crate::{
46 editor::GutterType,
57 graphics::{Style, UnderlineStyle},
@@ -55,7 +57,7 @@ pub fn diagnostic<'doc>(
5557 let error = theme.get("error");
5658 let info = theme.get("info");
5759 let hint = theme.get("hint");
58− let diagnostics = doc.shown_diagnostics().collect::<Vec<_>>();
60+ let diagnostics = &doc.diagnostics;
5961
6062 Box::new(
6163 move |line: usize, _selected: bool, first_visual_line: bool, out: &mut String| {
@@ -64,12 +66,20 @@ pub fn diagnostic<'doc>(
6466 }
6567 use helix_core::diagnostic::Severity;
6668 if let Ok(index) = diagnostics.binary_search_by_key(&line, |d| d.line) {
67− let after = diagnostics[index..].iter().take_while(|d| d.line == line);
69+ let on_line_and_is_visible = |d: &&Diagnostic| {
70+ d.line == line
71+ && doc
72+ .language_servers_with_feature(LanguageServerFeature::Diagnostics)
73+ .any(|ls| ls.id() == d.language_server_id)
74+ };
75+ let after = diagnostics[index..]
76+ .iter()
77+ .take_while(on_line_and_is_visible);
6878
6979 let before = diagnostics[..index]
7080 .iter()
7181 .rev()
72− .take_while(|d| d.line == line);
82+ .take_while(on_line_and_is_visible);
7383
7484 let diagnostics_on_line = after.chain(before);
7585