multi_buffer: Assert char boundary for panic due to point_to_buffer_offset (#40777)
Smit Barmase
and
Lukas Wirth
created
In an attempt to figure out what's wrong with `point_to_buffer_offset`
for crash https://github.com/zed-industries/zed/issues/40453. We want to
know which branch among these two is the bad one.
Release Notes:
- N/A
Co-authored-by: Lukas Wirth <lukas@zed.dev>
@@ -4454,10 +4454,23 @@ impl MultiBufferSnapshot {
&& region.has_trailing_newline
&& !region.is_main_buffer
{
- return Some((&cursor.excerpt()?.buffer, cursor.main_buffer_position()?));
+ let main_buffer_position = cursor.main_buffer_position()?;
+ let buffer_snapshot = &cursor.excerpt()?.buffer;
+ // remove this assert once we figure out the cause of the panics for #40453
+ buffer_snapshot
+ .text
+ .as_rope()
+ .assert_char_boundary(main_buffer_position);
+ return Some((buffer_snapshot, main_buffer_position));
} else if buffer_offset > region.buffer.len() {
return None;
}
+ // remove this assert once we figure out the cause of the panics for #40453
+ region
+ .buffer
+ .text
+ .as_rope()
+ .assert_char_boundary(buffer_offset);
Some((region.buffer, buffer_offset))
}
@@ -2402,17 +2402,8 @@ impl BufferSnapshot {
} else {
if offset > self.visible_text.len() {
panic!("offset {} is out of bounds", offset)
- } else if !self.visible_text.is_char_boundary(offset) {- // find the character- let char_start = self.visible_text.floor_char_boundary(offset);- // `char_start` must be less than len and a char boundary- let ch = self.visible_text.chars_at(char_start).next().unwrap();- let char_range = char_start..char_start + ch.len_utf8();- panic!(- "byte index {} is not a char boundary; it is inside {:?} (bytes {:?})",- offset, ch, char_range,- );
}
+ self.visible_text.assert_char_boundary(offset);
let (start, _, item) = self.fragments.find::<usize, _>(&None, &offset, bias);
let fragment = item.unwrap();
let overshoot = offset - start;