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

Remove disk diagnostics that were invalidated by a buffer edit

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-12-15 18:29:01 +01:00
parent 4ab307f0a1
commit 1bdaeda43e
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/language/src/buffer.rs
View file

@ -751,7 +751,9 @@ impl Buffer {
.peekable(); .peekable();
let mut last_edit_old_end = PointUtf16::zero(); let mut last_edit_old_end = PointUtf16::zero();
let mut last_edit_new_end = PointUtf16::zero(); let mut last_edit_new_end = PointUtf16::zero();
'outer: for entry in &mut diagnostics { let mut ix = 0;
'outer: while ix < diagnostics.len() {
let entry = &mut diagnostics[ix];
let mut start = entry.range.start; let mut start = entry.range.start;
let mut end = entry.range.end; let mut end = entry.range.end;
if entry if entry
@ -766,6 +768,7 @@ impl Buffer {
last_edit_new_end = edit.new.end; last_edit_new_end = edit.new.end;
edits_since_save.next(); edits_since_save.next();
} else if edit.old.start <= end && edit.old.end >= start { } else if edit.old.start <= end && edit.old.end >= start {
diagnostics.remove(ix);
continue 'outer; continue 'outer;
} else { } else {
break; break;
@ -786,6 +789,7 @@ impl Buffer {
entry.range.start = content.clip_point_utf16(entry.range.start, Bias::Left); entry.range.start = content.clip_point_utf16(entry.range.start, Bias::Left);
} }
} }
ix += 1;
} }
drop(edits_since_save); drop(edits_since_save);

16
crates/text/src/rope.rs
View file

@ -958,6 +958,22 @@ mod tests {
} }
} }
let mut point_utf16 = PointUtf16::zero();
for unit in expected.encode_utf16() {
let left_point = actual.clip_point_utf16(point_utf16, Bias::Left);
let right_point = actual.clip_point_utf16(point_utf16, Bias::Right);
assert!(right_point >= left_point);
// Ensure translating UTF-16 points to offsets doesn't panic.
actual.point_utf16_to_offset(left_point);
actual.point_utf16_to_offset(right_point);
if unit == b'\n' as u16 {
point_utf16 += PointUtf16::new(1, 0);
} else {
point_utf16 += PointUtf16::new(0, 1);
}
}
for _ in 0..5 { for _ in 0..5 {
let end_ix = clip_offset(&expected, rng.gen_range(0..=expected.len()), Right); let end_ix = clip_offset(&expected, rng.gen_range(0..=expected.len()), Right);
let start_ix = clip_offset(&expected, rng.gen_range(0..=end_ix), Left); let start_ix = clip_offset(&expected, rng.gen_range(0..=end_ix), Left);