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

Gracefully handle passing an empty set of ranges to push_excerpts

Browse source
This commit is contained in:
Antonio Scandurra 2022-02-25 15:36:16 +01:00
parent f649074d36
commit ff0fa0e0bd
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -687,6 +687,11 @@ impl MultiBuffer {
O: text::ToOffset, O: text::ToOffset,
{ {
assert_eq!(self.history.transaction_depth, 0); assert_eq!(self.history.transaction_depth, 0);
let mut ranges = ranges.into_iter().peekable();
if ranges.peek().is_none() {
return Default::default();
}
self.sync(cx); self.sync(cx);
let buffer_id = buffer.id(); let buffer_id = buffer.id();
@ -715,7 +720,7 @@ impl MultiBuffer {
let edit_start = new_excerpts.summary().text.bytes; let edit_start = new_excerpts.summary().text.bytes;
new_excerpts.update_last( new_excerpts.update_last(
|excerpt| { |excerpt| {
excerpt.has_trailing_newline = true; excerpt.has_trailing_newline = ranges.peek().is_some();
prev_id = excerpt.id.clone(); prev_id = excerpt.id.clone();
}, },
&(), &(),
@ -727,7 +732,6 @@ impl MultiBuffer {
} }
let mut ids = Vec::new(); let mut ids = Vec::new();
let mut ranges = ranges.into_iter().peekable();
while let Some(range) = ranges.next() { while let Some(range) = ranges.next() {
let id = ExcerptId::between(&prev_id, &next_id); let id = ExcerptId::between(&prev_id, &next_id);
if let Err(ix) = buffer_state.excerpts.binary_search(&id) { if let Err(ix) = buffer_state.excerpts.binary_search(&id) {
@ -1210,16 +1214,26 @@ impl MultiBuffer {
}; };
let buffer = buffer_handle.read(cx); let buffer = buffer_handle.read(cx);
let end_ix = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Bias::Right); let buffer_text = buffer.text();
let start_ix = buffer.clip_offset(rng.gen_range(0..=end_ix), Bias::Left); let ranges = (0..rng.gen_range(0..5))
.map(|_| {
let end_ix =
buffer.clip_offset(rng.gen_range(0..=buffer.len()), Bias::Right);
let start_ix = buffer.clip_offset(rng.gen_range(0..=end_ix), Bias::Left);
start_ix..end_ix
})
.collect::<Vec<_>>();
log::info!( log::info!(
"Inserting excerpt from buffer {} and range {:?}: {:?}", "Inserting excerpts from buffer {} and ranges {:?}: {:?}",
buffer_handle.id(), buffer_handle.id(),
start_ix..end_ix, ranges,
&buffer.text()[start_ix..end_ix] ranges
.iter()
.map(|range| &buffer_text[range.clone()])
.collect::<Vec<_>>()
); );
let excerpt_id = self.push_excerpts(buffer_handle.clone(), [start_ix..end_ix], cx); let excerpt_id = self.push_excerpts(buffer_handle.clone(), ranges, cx);
log::info!("Inserted with id: {:?}", excerpt_id); log::info!("Inserted with id: {:?}", excerpt_id);
} else { } else {
let remove_count = rng.gen_range(1..=excerpt_ids.len()); let remove_count = rng.gen_range(1..=excerpt_ids.len());