TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #77 from notoria/match_brackets

Browse source 
Fix match_brackets::find
This commit is contained in:
Blaž Hrastnik 2021-06-03 22:13:48 +09:00 • committed by GitHub
commit 74e4ac8d49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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