ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-11-10 14:46:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix match_brackets::find

Browse Source
This commit is contained in:
notoria 2021-06-03 10:35:17 +02:00
parent 7e8603247d
commit 4fe654cf9a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
use crate::{Range, Rope, Selection, Syntax};
// const PAIRS: &[(char, char)] = &[('(', ')'), ('{', '}'), ('[', ']')];
const PAIRS: &[(char, char)] = &[('(', ')'), ('{', '}'), ('[', ']'), ('<', '>')];
// limit matching pairs to only ( ) { } [ ] < >
#[must_use]
@ -20,15 +20,21 @@ pub fn find(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
None => return None,
};
if node.is_error() {
return None;
}
let start_byte = node.start_byte();
let end_byte = node.end_byte() - 1; // it's end exclusive
if start_byte == byte_pos {
return Some(doc.byte_to_char(end_byte));
}
if PAIRS.contains(&(doc.char(start_byte), doc.char(end_byte))) {
if start_byte == byte_pos {
return Some(doc.byte_to_char(end_byte));
}
if end_byte == byte_pos {
return Some(doc.byte_to_char(start_byte));
if end_byte == byte_pos {
return Some(doc.byte_to_char(start_byte));
}
}
None