mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-04 02:05:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #1010 from zed-industries/fix-stale-wrap-snapshot

Browse source 
Bump `FoldSnapshot` version if excerpt gets edited outside of its bounds
This commit is contained in:
Antonio Scandurra 2022-05-18 10:44:08 +02:00 committed by GitHub
commit 610812eca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/editor/src/display_map/fold_map.rs
View file

@ -271,7 +271,8 @@ impl FoldMap {
) -> Vec<FoldEdit> {
if buffer_edits.is_empty() {
let mut buffer = self.buffer.lock();
if buffer.parse_count() != new_buffer.parse_count()
if buffer.edit_count() != new_buffer.edit_count()
|| buffer.parse_count() != new_buffer.parse_count()
|| buffer.diagnostics_update_count() != new_buffer.diagnostics_update_count()
|| buffer.trailing_excerpt_update_count()
!= new_buffer.trailing_excerpt_update_count()

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

@ -93,6 +93,7 @@ pub struct MultiBufferSnapshot {
parse_count: usize,
diagnostics_update_count: usize,
trailing_excerpt_update_count: usize,
edit_count: usize,
is_dirty: bool,
has_conflict: bool,
}
@ -1151,6 +1152,7 @@ impl MultiBuffer {
let mut diagnostics_updated = false;
let mut is_dirty = false;
let mut has_conflict = false;
let mut edited = false;
let mut buffers = self.buffers.borrow_mut();
for buffer_state in buffers.values_mut() {
let buffer = buffer_state.buffer.read(cx);
@ -1186,11 +1188,15 @@ impl MultiBuffer {
);
}
edited |= buffer_edited;
reparsed |= buffer_reparsed;
diagnostics_updated |= buffer_diagnostics_updated;
is_dirty |= buffer.is_dirty();
has_conflict |= buffer.has_conflict();
}
if edited {
snapshot.edit_count += 1;
}
if reparsed {
snapshot.parse_count += 1;
}
@ -2172,6 +2178,10 @@ impl MultiBufferSnapshot {
})
}
pub fn edit_count(&self) -> usize {
self.edit_count
}
pub fn parse_count(&self) -> usize {
self.parse_count
}