andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

cargo fmt + clippy lint

Browse Source
This commit is contained in:
Blaž Hrastnik 2022-01-23 16:15:27 +09:00
parent 7c9ebd05b8
commit 4080341977
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helix-core/src/syntax.rs
View File

@ -436,7 +436,7 @@ pub fn new(source: &Rope, config: Arc<HighlightConfiguration>, loader: Arc<Loade
};
syntax
.update(source, source, &ChangeSet::new(&source))
.update(source, source, &ChangeSet::new(source))
.unwrap();
syntax
@ -735,9 +735,7 @@ pub fn highlight_iter<'a>(
.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(),

6
helix-view/src/document.rs
View File

@ -594,11 +594,7 @@ pub fn set_language(
/// 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));

6
helix-view/src/editor.rs
View File

@ -456,11 +456,7 @@ pub fn open(&mut self, path: PathBuf, action: Action) -> Result<DocumentId, Erro
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);