Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-view/src/gutter.rs')
| -rw-r--r-- | helix-view/src/gutter.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs index 7506e515..665a78bc 100644 --- a/helix-view/src/gutter.rs +++ b/helix-view/src/gutter.rs @@ -1,6 +1,6 @@ use std::fmt::Write; -use helix_core::syntax::config::LanguageServerFeature; +use helix_core::syntax::LanguageServerFeature; use crate::{ editor::GutterType, @@ -69,7 +69,7 @@ pub fn diagnostic<'doc>( .iter() .take_while(|d| { d.line == line - && d.provider.language_server_id().is_none_or(|id| { + && d.provider.language_server_id().map_or(true, |id| { doc.language_servers_with_feature(LanguageServerFeature::Diagnostics) .any(|ls| ls.id() == id) }) @@ -334,7 +334,7 @@ mod tests { use crate::graphics::Rect; use crate::DocumentId; use arc_swap::ArcSwap; - use helix_core::{syntax, Rope}; + use helix_core::Rope; #[test] fn test_default_gutter_widths() { @@ -346,7 +346,6 @@ mod tests { rope, None, Arc::new(ArcSwap::new(Arc::new(Config::default()))), - Arc::new(ArcSwap::from_pointee(syntax::Loader::default())), ); assert_eq!(view.gutters.layout.len(), 5); @@ -372,7 +371,6 @@ mod tests { rope, None, Arc::new(ArcSwap::new(Arc::new(Config::default()))), - Arc::new(ArcSwap::from_pointee(syntax::Loader::default())), ); assert_eq!(view.gutters.layout.len(), 1); @@ -391,7 +389,6 @@ mod tests { rope, None, Arc::new(ArcSwap::new(Arc::new(Config::default()))), - Arc::new(ArcSwap::from_pointee(syntax::Loader::default())), ); assert_eq!(view.gutters.layout.len(), 2); @@ -414,7 +411,6 @@ mod tests { rope, None, Arc::new(ArcSwap::new(Arc::new(Config::default()))), - Arc::new(ArcSwap::from_pointee(syntax::Loader::default())), ); let rope = Rope::from_str("a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\nm\nn\no\np"); @@ -422,7 +418,6 @@ mod tests { rope, None, Arc::new(ArcSwap::new(Arc::new(Config::default()))), - Arc::new(ArcSwap::from_pointee(syntax::Loader::default())), ); assert_eq!(view.gutters.layout.len(), 2); |