From ffb8057a7fcd65b5caaa1e86b66c6f6e0fb5270f Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Thu, 22 Jul 2021 18:45:43 -0700 Subject: [PATCH] Fix ocassional panic when matching brackets. --- helix-core/src/match_brackets.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helix-core/src/match_brackets.rs b/helix-core/src/match_brackets.rs index 2aa87620..f3d9e845 100644 --- a/helix-core/src/match_brackets.rs +++ b/helix-core/src/match_brackets.rs @@ -24,12 +24,13 @@ pub fn find(syntax: &Syntax, doc: &Rope, pos: usize) -> Option { return None; } - let start_byte = node.start_byte(); let len = doc.len_bytes(); - if start_byte >= len { + let start_byte = node.start_byte(); + let end_byte = node.end_byte() - 1; // it's end exclusive + if start_byte >= len || end_byte >= len { return None; } - 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);