bendns' repos / helix
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-syntax/src/tree_sitter/ropey.rs')
-rw-r--r--helix-syntax/src/tree_sitter/ropey.rs40
1 files changed, 28 insertions, 12 deletions
diff --git a/helix-syntax/src/tree_sitter/ropey.rs b/helix-syntax/src/tree_sitter/ropey.rs
index aa59b2f2..3e2354da 100644
--- a/helix-syntax/src/tree_sitter/ropey.rs
+++ b/helix-syntax/src/tree_sitter/ropey.rs
@@ -1,38 +1,54 @@
+use std::ops;
+
use regex_cursor::{Cursor, RopeyCursor};
use ropey::RopeSlice;
-use crate::tree_sitter::parser::{IntoParserInput, ParserInput};
+use crate::tree_sitter::{IntoTsInput, TsInput};
-pub struct RopeParserInput<'a> {
+pub struct RopeTsInput<'a> {
src: RopeSlice<'a>,
cursor: regex_cursor::RopeyCursor<'a>,
}
-impl<'a> IntoParserInput for RopeSlice<'a> {
- type ParserInput = RopeParserInput<'a>;
+impl<'a> RopeTsInput<'a> {
+ pub fn new(src: RopeSlice<'a>) -> Self {
+ RopeTsInput {
+ src,
+ cursor: regex_cursor::RopeyCursor::new(src),
+ }
+ }
+}
- fn into_parser_input(self) -> Self::ParserInput {
- RopeParserInput {
+impl<'a> IntoTsInput for RopeSlice<'a> {
+ type TsInput = RopeTsInput<'a>;
+
+ fn into_ts_input(self) -> Self::TsInput {
+ RopeTsInput {
src: self,
cursor: RopeyCursor::new(self),
}
}
}
-impl ParserInput for RopeParserInput<'_> {
- fn read(&mut self, offset: usize) -> &[u8] {
+impl<'a> TsInput for RopeTsInput<'a> {
+ type Cursor = RopeyCursor<'a>;
+ fn cursor_at(&mut self, offset: usize) -> &mut RopeyCursor<'a> {
// this cursor is optimized for contigous reads which are by far the most common during parsing
// very far jumps (like injections at the other end of the document) are handelde
- // by restarting a new cursor (new chunks iterator)
- if offset < self.cursor.offset() && self.cursor.offset() - offset > 4906 {
+ // by starting a new cursor (new chunks iterator)
+ if offset < self.cursor.offset() || self.cursor.offset() - offset > 4906 {
self.cursor = regex_cursor::RopeyCursor::at(self.src, offset);
} else {
while self.cursor.offset() + self.cursor.chunk().len() >= offset {
if !self.cursor.advance() {
- return &[];
+ break;
}
}
}
- self.cursor.chunk()
+ &mut self.cursor
+ }
+
+ fn eq(&mut self, range1: ops::Range<usize>, range2: ops::Range<usize>) -> bool {
+ self.src.byte_slice(range1) == self.src.byte_slice(range2)
}
}