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

Fix collection of row ranges in Buffer::perform_autoindent

Browse source
This commit is contained in:
Max Brunsfeld 2021-10-07 12:43:26 -07:00
parent 2f295382c4
commit b5d3ffb16c
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/buffer/src/lib.rs
View file

@ -1022,31 +1022,28 @@ impl Buffer {
} }
self.autoindent_requests = autoindent_requests; self.autoindent_requests = autoindent_requests;
let mut row_range = None; let mut row_range: Option<Range<u32>> = None;
let mut cursor1 = QueryCursorHandle::new(); let mut cursor1 = QueryCursorHandle::new();
let mut cursor2 = QueryCursorHandle::new(); let mut cursor2 = QueryCursorHandle::new();
self.start_transaction(None).unwrap(); self.start_transaction(None).unwrap();
for row in autoindent_requests_by_row.keys().copied() { for row in autoindent_requests_by_row.keys().copied() {
match &mut row_range { if let Some(range) = &mut row_range {
None => row_range = Some(row..(row + 1)), if range.end == row {
Some(range) => { range.end += 1;
if range.end == row { continue;
range.end += 1;
} else {
self.perform_autoindent_for_rows(
range.clone(),
old_tree.as_ref(),
&new_tree,
&autoindent_requests_by_row,
language.as_ref(),
&mut cursor1,
&mut cursor2,
cx,
);
row_range.take();
}
} }
self.perform_autoindent_for_rows(
range.clone(),
old_tree.as_ref(),
&new_tree,
&autoindent_requests_by_row,
language.as_ref(),
&mut cursor1,
&mut cursor2,
cx,
);
} }
row_range = Some(row..(row + 1));
} }
if let Some(range) = row_range { if let Some(range) = row_range {
self.perform_autoindent_for_rows( self.perform_autoindent_for_rows(