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

Implement MultiBuffer::enclosing_bracket_ranges

Browse source
This commit is contained in:
Antonio Scandurra 2021-12-17 15:05:05 +01:00
parent c9cbc2fe1e
commit 5f819b6edc
1 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/editor/src/multi_buffer.rs
View file

@ -1435,7 +1435,51 @@ impl MultiBufferSnapshot {
range: Range<T>, range: Range<T>,
) -> Option<(Range<usize>, Range<usize>)> { ) -> Option<(Range<usize>, Range<usize>)> {
let range = range.start.to_offset(self)..range.end.to_offset(self); let range = range.start.to_offset(self)..range.end.to_offset(self);
self.as_singleton().unwrap().enclosing_bracket_ranges(range)
let mut cursor = self.excerpts.cursor::<usize>();
cursor.seek(&range.start, Bias::Right, &());
let start_excerpt = cursor.item();
cursor.seek(&range.end, Bias::Right, &());
let end_excerpt = cursor.item();
start_excerpt
.zip(end_excerpt)
.and_then(|(start_excerpt, end_excerpt)| {
if start_excerpt.id != end_excerpt.id {
return None;
}
let excerpt_buffer_start =
start_excerpt.range.start.to_offset(&start_excerpt.buffer);
let excerpt_buffer_end = excerpt_buffer_start + start_excerpt.text_summary.bytes
- start_excerpt.header_height as usize;
let start_after_header = cursor.start() + start_excerpt.header_height as usize;
let start_in_buffer =
excerpt_buffer_start + range.start.saturating_sub(start_after_header);
let end_in_buffer =
excerpt_buffer_start + range.end.saturating_sub(start_after_header);
let (mut start_bracket_range, mut end_bracket_range) = start_excerpt
.buffer
.enclosing_bracket_ranges(start_in_buffer..end_in_buffer)?;
if start_bracket_range.start >= excerpt_buffer_start
&& end_bracket_range.end < excerpt_buffer_end
{
start_bracket_range.start =
start_after_header + (start_bracket_range.start - excerpt_buffer_start);
start_bracket_range.end =
start_after_header + (start_bracket_range.end - excerpt_buffer_start);
end_bracket_range.start =
start_after_header + (end_bracket_range.start - excerpt_buffer_start);
end_bracket_range.end =
start_after_header + (end_bracket_range.end - excerpt_buffer_start);
Some((start_bracket_range, end_bracket_range))
} else {
None
}
})
} }
pub fn diagnostics_update_count(&self) -> usize { pub fn diagnostics_update_count(&self) -> usize {