git.iko.soy/helix
on master help sign in
Simplify gutter diagnostics rendering by using partition_point instead of binary search
656ee24Philipp Mildenberger
helix-view/src/gutter.rs+17−25
compare with master
unifiedsplit
@@ -1,6 +1,6 @@
1use std::fmt::Write;
1use std::fmt::Write;
2
2
3−use helix_core::{syntax::LanguageServerFeature, Diagnostic};
3+use helix_core::syntax::LanguageServerFeature;
4
4
5use crate::{
5use crate::{
6 editor::GutterType,
6 editor::GutterType,
@@ -65,35 +65,27 @@ pub fn diagnostic<'doc>(
65 return None;
65 return None;
66 }
66 }
67 use helix_core::diagnostic::Severity;
67 use helix_core::diagnostic::Severity;
68− if let Ok(index) = diagnostics.binary_search_by_key(&line, |d| d.line) {
68+ let first_diag_idx_maybe_on_line = diagnostics.partition_point(|d| d.line < line);
69− let on_line_and_is_visible = |d: &&Diagnostic| {
69+ if first_diag_idx_maybe_on_line == diagnostics.len() {
70+ return None;
71+ }
72+ let diagnostics_on_line = diagnostics[first_diag_idx_maybe_on_line..]
73+ .iter()
74+ .take_while(|d| {
70 d.line == line
75 d.line == line
71 && doc
76 && doc
72 .language_servers_with_feature(LanguageServerFeature::Diagnostics)
77 .language_servers_with_feature(LanguageServerFeature::Diagnostics)
73 .any(|ls| ls.id() == d.language_server_id)
78 .any(|ls| ls.id() == d.language_server_id)
74− };
79+ });
75− let after = diagnostics[index..]
76− .iter()
77− .take_while(on_line_and_is_visible);
78−
79− let before = diagnostics[..index]
80− .iter()
81− .rev()
82− .take_while(on_line_and_is_visible);
83−
84− let diagnostics_on_line = after.chain(before);
85−
86− if let Some(diagnostic) = diagnostics_on_line.max_by_key(|d| d.severity) {
80+ diagnostics_on_line.max_by_key(|d| d.severity).map(|d| {
87− write!(out, "●").ok();
81+ write!(out, "●").ok();
88− return Some(match diagnostic.severity {
82+ match d.severity {
89− Some(Severity::Error) => error,
83+ Some(Severity::Error) => error,
90− Some(Severity::Warning) | None => warning,
84+ Some(Severity::Warning) | None => warning,
91− Some(Severity::Info) => info,
85+ Some(Severity::Info) => info,
92− Some(Severity::Hint) => hint,
86+ Some(Severity::Hint) => hint,
93− });
94 }
87 }
95− }
88+ })
96− None
97 },
89 },
98 )
90 )
99}
91}