Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

editor: Fix panic when editor::SelectLargerSyntaxNode overflows excerpt in multi buffer (#25585)

Browse source 
Closes #25513

This PR handles case when `editor::SelectLargerSyntaxNode` expands
across excerpt boundaries and eventually crashes in multi buffer.

Release Notes:

- Fixed panic caused when `editor::SelectLargerSyntaxNode` is called
repetedly in multi buffer.

Co-authored-by: Ben Kunkle <ben.kunkle@gmail.com>
This commit is contained in:
smit 2025-02-26 01:05:00 +05:30 • committed by GitHub
parent 014d9dfce1
commit 0559e1f348
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/multi_buffer/src/multi_buffer.rs
View file

@ -78,6 +78,12 @@ pub struct MultiBuffer {
capability: Capability,
}
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum MultiOrSingleBufferOffsetRange {
Single(Range<usize>),
Multi(Range<usize>),
}
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum Event {
ExcerptsAdded {
@ -5682,13 +5688,19 @@ impl MultiBufferSnapshot {
pub fn syntax_ancestor<T: ToOffset>(
&self,
range: Range<T>,
) -> Option<(tree_sitter::Node, Range<usize>)> {
) -> Option<(tree_sitter::Node, MultiOrSingleBufferOffsetRange)> {
let range = range.start.to_offset(self)..range.end.to_offset(self);
let mut excerpt = self.excerpt_containing(range.clone())?;
let node = excerpt
.buffer()
.syntax_ancestor(excerpt.map_range_to_buffer(range))?;
Some((node, excerpt.map_range_from_buffer(node.byte_range())))
let node_range = node.byte_range();
let range = if excerpt.contains_buffer_range(node_range.clone()) {
MultiOrSingleBufferOffsetRange::Multi(excerpt.map_range_from_buffer(node_range))
} else {
MultiOrSingleBufferOffsetRange::Single(node_range)
};
Some((node, range))
}
pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Option<Outline<Anchor>> {
@ -6660,9 +6672,17 @@ impl<'a> MultiBufferExcerpt<'a> {
/// Map a range within the [`Buffer`] to a range within the [`MultiBuffer`]
pub fn map_range_from_buffer(&mut self, buffer_range: Range<usize>) -> Range<usize> {
if buffer_range.start < self.buffer_offset {
log::warn!("Attempting to map a range from a buffer offset that starts before the current buffer offset");
return buffer_range;
}
let overshoot = buffer_range.start - self.buffer_offset;
let excerpt_offset = ExcerptDimension(self.excerpt_offset.0 + overshoot);
self.diff_transforms.seek(&excerpt_offset, Bias::Right, &());
if excerpt_offset.0 < self.diff_transforms.start().1 .0 {
log::warn!("Attempting to map a range from a buffer offset that starts before the current buffer offset");
return buffer_range;
}
let overshoot = excerpt_offset.0 - self.diff_transforms.start().1 .0;
let start = self.diff_transforms.start().0 .0 + overshoot;