Use cached buffer position conversions for text properties

Author: eval-exec

neovm-core/src/buffer/buffer_text.rs

@@ -489,24 +489,16 @@ impl BufferText {
     ) -> bool {
         // GNU intervals are character-indexed; BufferText owns the conversion
         // from buffer byte offsets into interval positions.
-        let (start, end) = {
-            let storage = self.storage.borrow();
-            (
-                storage.gap.byte_to_char(start),
-                storage.gap.byte_to_char(end),
-            )
-        };
+        let start = self.buf_bytepos_to_charpos(start);
+        let end = self.buf_bytepos_to_charpos(end);
         self.storage
             .borrow_mut()
             .text_props
             .put_property(start, end, name, value)
     }
 
     pub fn text_props_get_property(&self, pos: usize, name: Value) -> Option<Value> {
-        let pos = {
-            let storage = self.storage.borrow();
-            storage.gap.byte_to_char(pos)
-        };
+        let pos = self.buf_bytepos_to_charpos(pos);
         self.storage
             .borrow()
             .text_props
@@ -515,83 +507,67 @@ impl BufferText {
     }
 
     pub fn text_props_get_properties(&self, pos: usize) -> HashMap<Value, Value> {
-        let pos = {
-            let storage = self.storage.borrow();
-            storage.gap.byte_to_char(pos)
-        };
+        let pos = self.buf_bytepos_to_charpos(pos);
         self.storage.borrow().text_props.get_properties(pos)
     }
 
     pub fn text_props_get_properties_ordered(&self, pos: usize) -> Vec<(Value, Value)> {
-        let pos = {
-            let storage = self.storage.borrow();
-            storage.gap.byte_to_char(pos)
-        };
+        let pos = self.buf_bytepos_to_charpos(pos);
         self.storage.borrow().text_props.get_properties_ordered(pos)
     }
 
     pub fn text_props_remove_property(&self, start: usize, end: usize, name: Value) -> bool {
-        let (start, end) = {
-            let storage = self.storage.borrow();
-            (
-                storage.gap.byte_to_char(start),
-                storage.gap.byte_to_char(end),
-            )
-        };
+        let start = self.buf_bytepos_to_charpos(start);
+        let end = self.buf_bytepos_to_charpos(end);
         self.storage
             .borrow_mut()
             .text_props
             .remove_property(start, end, name)
     }
 
     pub fn text_props_remove_all(&self, start: usize, end: usize) {
-        let (start, end) = {
-            let storage = self.storage.borrow();
-            (
-                storage.gap.byte_to_char(start),
-                storage.gap.byte_to_char(end),
-            )
-        };
+        let start = self.buf_bytepos_to_charpos(start);
+        let end = self.buf_bytepos_to_charpos(end);
         self.storage
             .borrow_mut()
             .text_props
             .remove_all_properties(start, end);
     }
 
     pub fn text_props_next_change(&self, pos: usize) -> Option<usize> {
-        let storage = self.storage.borrow();
-        let char_pos = storage.gap.byte_to_char(pos);
-        storage
-            .text_props
-            .next_property_change(char_pos)
-            .map(|next| storage.gap.char_to_byte(next))
+        let char_pos = self.buf_bytepos_to_charpos(pos);
+        let next = {
+            self.storage
+                .borrow()
+                .text_props
+                .next_property_change(char_pos)
+        };
+        next.map(|next| self.buf_charpos_to_bytepos(next))
     }
 
     pub fn text_props_previous_change(&self, pos: usize) -> Option<usize> {
-        let storage = self.storage.borrow();
-        let char_pos = storage.gap.byte_to_char(pos);
-        storage
-            .text_props
-            .previous_property_change(char_pos)
-            .map(|prev| storage.gap.char_to_byte(prev))
+        let char_pos = self.buf_bytepos_to_charpos(pos);
+        let prev = {
+            self.storage
+                .borrow()
+                .text_props
+                .previous_property_change(char_pos)
+        };
+        prev.map(|prev| self.buf_charpos_to_bytepos(prev))
     }
 
     pub fn text_props_append_shifted(&self, other: &TextPropertyTable, byte_offset: usize) {
-        let char_offset = {
-            let storage = self.storage.borrow();
-            storage.gap.byte_to_char(byte_offset)
-        };
+        let char_offset = self.buf_bytepos_to_charpos(byte_offset);
         self.storage
             .borrow_mut()
             .text_props
             .append_shifted(other, char_offset);
     }
 
     pub fn text_props_slice(&self, start: usize, end: usize) -> TextPropertyTable {
-        let storage = self.storage.borrow();
-        let start = storage.gap.byte_to_char(start);
-        let end = storage.gap.byte_to_char(end);
-        storage.text_props.slice(start, end)
+        let start = self.buf_bytepos_to_charpos(start);
+        let end = self.buf_bytepos_to_charpos(end);
+        self.storage.borrow().text_props.slice(start, end)
     }
 
     pub fn text_props_intervals_snapshot(&self) -> Vec<PropertyInterval> {