mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

minor: Remove a few unwraps.

Browse source
This commit is contained in:
Blaž Hrastnik 2021-03-26 11:02:32 +09:00
parent cf0e191a6a
commit ad3325db8e
6 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
helix-core/src/syntax.rs
View file

@ -172,7 +172,7 @@ thread_local! {
pub struct Syntax {
config: Arc<HighlightConfiguration>,
pub(crate) root_layer: LanguageLayer,
root_layer: LanguageLayer,
}
fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<str> {
@ -251,7 +251,7 @@ impl Syntax {
//
// fn parse(language, old_tree, ranges)
//
fn tree(&self) -> &Tree {
pub fn tree(&self) -> &Tree {
self.root_layer.tree()
}
//
@ -363,7 +363,7 @@ impl LanguageLayer {
// Self { tree: None }
// }
fn tree(&self) -> &Tree {
pub fn tree(&self) -> &Tree {
// TODO: no unwrap
self.tree.as_ref().unwrap()
}
@ -1566,7 +1566,7 @@ fn test_parser() {
",
);
let syntax = Syntax::new(&source, Arc::new(config));
let tree = syntax.root_layer.tree.unwrap();
let tree = syntax.tree();
let root = tree.root_node();
assert_eq!(root.kind(), "source_file");