suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert byte index to char index for `find`

pull/106/head
notoria 2021-06-04 02:40:42 +02:00 committed by Blaž Hrastnik
parent d55419604c
commit f76f44c8af
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
helix-core/src/.match_brackets.rs.swp 100644
View File

Binary file not shown.

8
helix-core/src/match_brackets.rs
View File

@ -26,14 +26,16 @@ pub fn find(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
let start_byte = node.start_byte(); let start_byte = node.start_byte();
let end_byte = node.end_byte() - 1; // it's end exclusive let end_byte = node.end_byte() - 1; // it's end exclusive
let start_char = doc.byte_to_char(start_byte);
let end_char = doc.byte_to_char(end_byte);
if PAIRS.contains(&(doc.char(start_byte), doc.char(end_byte))) { if PAIRS.contains(&(doc.char(start_char), doc.char(end_char))) {
if start_byte == byte_pos { if start_byte == byte_pos {
return Some(doc.byte_to_char(end_byte)); return Some(end_char);
} }
if end_byte == byte_pos { if end_byte == byte_pos {
return Some(doc.byte_to_char(start_byte)); return Some(start_char);
} }
} }