16b9a18 · helix · git.iko.soy

on master help sign in

fix: map_err()? instead of unwrap (#3826)

16b9a18Alexander Brevig4 years ago

helix-core/src/syntax.rs+4−1

@@ -985,7 +985,9 @@ impl LanguageLayer {

985 }

986

987 fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {

988+ parser

988− parser.set_included_ranges(&self.ranges).unwrap();

989+ .set_included_ranges(&self.ranges)

990+ .map_err(|_| Error::InvalidRanges)?;

989

991

990 parser

992 parser

991 .set_language(self.config.language)

993 .set_language(self.config.language)

@@ -1135,6 +1137,7 @@ pub struct Highlight(pub usize);

1135pub enum Error {

1137pub enum Error {

1136 Cancelled,

1138 Cancelled,

1137 InvalidLanguage,

1139 InvalidLanguage,

1140+ InvalidRanges,

1138 Unknown,

1141 Unknown,

1139}

1142}

1140

1143