on master help sign in
Make Layer::parse take &mut tree_sitter::Parser
commit9d41113ae02665fd73a7e25b4aff9cc416cfe4ae authorBlaž Hrastnik <blaz@mxxn.io> dateMon 10 Jan 2022, 00:50 (5 years ago) parente22dbf1
1 file changed+5−7
helix-core/src/syntax.rs+5−7
helix-core/src/syntax.rs+5−7
@@ -584,7 +584,7 @@ impl Syntax {
584584 }
585585
586586 // Re-parse the tree.
587− layer.parse(ts_parser, source)?;
587+ layer.parse(&mut ts_parser.parser, source)?;
588588
589589 // Switch to an immutable borrow.
590590 let layer = &self.layers[layer_id];
@@ -822,17 +822,15 @@ impl LanguageLayer {
822822 self.tree.as_ref().unwrap()
823823 }
824824
825− fn parse(&mut self, ts_parser: &mut TsParser, source: &Rope) -> Result<(), Error> {
826− ts_parser.parser.set_included_ranges(&self.ranges).unwrap();
825+ fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
826+ parser.set_included_ranges(&self.ranges).unwrap();
827827
828− ts_parser
829− .parser
828+ parser
830829 .set_language(self.config.language)
831830 .map_err(|_| Error::InvalidLanguage)?;
832831
833832 // unsafe { syntax.parser.set_cancellation_flag(cancellation_flag) };
834− let tree = ts_parser
835− .parser
833+ let tree = parser
836834 .parse_with(
837835 &mut |byte, _| {
838836 if byte <= source.len_bytes() {