diff options
| -rw-r--r-- | helix-core/src/syntax.rs | 6 | ||||
| -rw-r--r-- | helix-view/src/document.rs | 6 | ||||
| -rw-r--r-- | helix-view/src/editor.rs | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs index 6a8a9be5..d6ec7610 100644 --- a/helix-core/src/syntax.rs +++ b/helix-core/src/syntax.rs @@ -436,7 +436,7 @@ impl Syntax { }; syntax - .update(source, source, &ChangeSet::new(&source)) + .update(source, source, &ChangeSet::new(source)) .unwrap(); syntax @@ -735,9 +735,7 @@ impl Syntax { .peekable(); // If there's no captures, skip the layer - if captures.peek().is_none() { - return None; - } + captures.peek()?; Some(HighlightIterLayer { highlight_end_stack: Vec::new(), diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index 0b5cfd22..413da7b2 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -594,11 +594,7 @@ impl Document { /// Set the programming language for the file if you know the name (scope) but don't have the /// [`syntax::LanguageConfiguration`] for it. - pub fn set_language2( - &mut self, - scope: &str, - config_loader: Arc<syntax::Loader>, - ) { + pub fn set_language2(&mut self, scope: &str, config_loader: Arc<syntax::Loader>) { let language_config = config_loader.language_config_for_scope(scope); self.set_language(language_config, Some(config_loader)); diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index caf2bce7..5f71fd46 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -456,11 +456,7 @@ impl Editor { let id = if let Some(id) = id { id } else { - let mut doc = Document::open( - &path, - None, - Some(self.syn_loader.clone()), - )?; + let mut doc = Document::open(&path, None, Some(self.syn_loader.clone()))?; let _ = Self::launch_language_server(&mut self.language_servers, &mut doc); |