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

Update multibuffer when buffers' syntax trees or diagnostics change

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-12-10 15:53:53 -08:00
parent ceff57d02f
commit 75dd37d873
2 changed files with 58 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -580,6 +580,10 @@ impl Buffer {
self.parse_count self.parse_count
} }
pub fn diagnostics_update_count(&self) -> usize {
self.diagnostics_update_count
}
pub(crate) fn syntax_tree(&self) -> Option<Tree> { pub(crate) fn syntax_tree(&self) -> Option<Tree> {
if let Some(syntax_tree) = self.syntax_tree.lock().as_mut() { if let Some(syntax_tree) = self.syntax_tree.lock().as_mut() {
self.interpolate_tree(syntax_tree); self.interpolate_tree(syntax_tree);

88
crates/language/src/multi_buffer.rs
View file

@ -3,7 +3,7 @@ mod selection;
use crate::{ use crate::{
buffer::{self, Buffer, Chunk, ToOffset as _, ToPoint as _}, buffer::{self, Buffer, Chunk, ToOffset as _, ToPoint as _},
BufferSnapshot, DiagnosticEntry, File, Language, BufferSnapshot, DiagnosticEntry, Event, File, Language,
}; };
pub use anchor::{Anchor, AnchorRangeExt}; pub use anchor::{Anchor, AnchorRangeExt};
use anyhow::Result; use anyhow::Result;
@ -52,7 +52,9 @@ pub trait ToPoint: 'static {
#[derive(Debug)] #[derive(Debug)]
struct BufferState { struct BufferState {
buffer: ModelHandle<Buffer>, buffer: ModelHandle<Buffer>,
last_sync: clock::Global, last_version: clock::Global,
last_parse_count: usize,
last_diagnostics_update_count: usize,
excerpts: Vec<ExcerptId>, excerpts: Vec<ExcerptId>,
} }
@ -388,6 +390,9 @@ impl MultiBuffer {
{ {
self.sync(cx); self.sync(cx);
let buffer = &props.buffer;
cx.subscribe(buffer, Self::on_buffer_event).detach();
let buffer = props.buffer.read(cx); let buffer = props.buffer.read(cx);
let range = buffer.anchor_before(props.range.start)..buffer.anchor_after(props.range.end); let range = buffer.anchor_before(props.range.start)..buffer.anchor_after(props.range.end);
let mut snapshot = self.snapshot.borrow_mut(); let mut snapshot = self.snapshot.borrow_mut();
@ -411,7 +416,9 @@ impl MultiBuffer {
.entry(props.buffer.id()) .entry(props.buffer.id())
.or_insert_with(|| BufferState { .or_insert_with(|| BufferState {
buffer: props.buffer.clone(), buffer: props.buffer.clone(),
last_sync: buffer.version(), last_version: buffer.version(),
last_parse_count: buffer.parse_count(),
last_diagnostics_update_count: buffer.diagnostics_update_count(),
excerpts: Default::default(), excerpts: Default::default(),
}) })
.excerpts .excerpts
@ -422,6 +429,15 @@ impl MultiBuffer {
id id
} }
fn on_buffer_event(
&mut self,
_: ModelHandle<Buffer>,
event: &Event,
cx: &mut ModelContext<Self>,
) {
cx.emit(event.clone());
}
pub fn save( pub fn save(
&mut self, &mut self,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
@ -456,61 +472,65 @@ impl MultiBuffer {
let mut snapshot = self.snapshot.borrow_mut(); let mut snapshot = self.snapshot.borrow_mut();
let mut excerpts_to_edit = Vec::new(); let mut excerpts_to_edit = Vec::new();
for buffer_state in self.buffers.values() { for buffer_state in self.buffers.values() {
if buffer_state let buffer = buffer_state.buffer.read(cx);
.buffer let buffer_changed = buffer.version().gt(&buffer_state.last_version);
.read(cx) if buffer_changed
.version() || buffer.parse_count() > buffer_state.last_parse_count
.gt(&buffer_state.last_sync) || buffer.diagnostics_update_count() > buffer_state.last_diagnostics_update_count
{ {
excerpts_to_edit.extend( excerpts_to_edit.extend(
buffer_state buffer_state
.excerpts .excerpts
.iter() .iter()
.map(|excerpt_id| (excerpt_id, buffer_state)), .map(|excerpt_id| (excerpt_id, buffer_state, buffer_changed)),
); );
} }
} }
excerpts_to_edit.sort_unstable_by_key(|(excerpt_id, _)| *excerpt_id); excerpts_to_edit.sort_unstable_by_key(|(excerpt_id, _, _)| *excerpt_id);
let mut edits = Vec::new(); let mut edits = Vec::new();
let mut new_excerpts = SumTree::new(); let mut new_excerpts = SumTree::new();
let mut cursor = snapshot.excerpts.cursor::<(Option<&ExcerptId>, usize)>(); let mut cursor = snapshot.excerpts.cursor::<(Option<&ExcerptId>, usize)>();
for (id, buffer_state) in excerpts_to_edit { for (id, buffer_state, buffer_changed) in excerpts_to_edit {
new_excerpts.push_tree(cursor.slice(&Some(id), Bias::Left, &()), &()); new_excerpts.push_tree(cursor.slice(&Some(id), Bias::Left, &()), &());
let old_excerpt = cursor.item().unwrap(); let old_excerpt = cursor.item().unwrap();
let buffer = buffer_state.buffer.read(cx); let buffer = buffer_state.buffer.read(cx);
edits.extend( let mut new_excerpt;
buffer if buffer_changed {
.edits_since_in_range::<usize>( edits.extend(
old_excerpt.buffer.version(), buffer
old_excerpt.range.clone(), .edits_since_in_range::<usize>(
) old_excerpt.buffer.version(),
.map(|mut edit| { old_excerpt.range.clone(),
let excerpt_old_start = )
cursor.start().1 + old_excerpt.header_height as usize; .map(|mut edit| {
let excerpt_new_start = let excerpt_old_start =
new_excerpts.summary().text.bytes + old_excerpt.header_height as usize; cursor.start().1 + old_excerpt.header_height as usize;
edit.old.start += excerpt_old_start; let excerpt_new_start = new_excerpts.summary().text.bytes
edit.old.end += excerpt_old_start; + old_excerpt.header_height as usize;
edit.new.start += excerpt_new_start; edit.old.start += excerpt_old_start;
edit.new.end += excerpt_new_start; edit.old.end += excerpt_old_start;
edit edit.new.start += excerpt_new_start;
}), edit.new.end += excerpt_new_start;
); edit
}),
);
new_excerpts.push( new_excerpt = Excerpt::new(
Excerpt::new(
id.clone(), id.clone(),
buffer.snapshot(), buffer.snapshot(),
old_excerpt.range.clone(), old_excerpt.range.clone(),
old_excerpt.header_height, old_excerpt.header_height,
!self.singleton, !self.singleton,
), );
&(), } else {
); new_excerpt = old_excerpt.clone();
new_excerpt.buffer = buffer.snapshot();
}
new_excerpts.push(new_excerpt, &());
cursor.next(&()); cursor.next(&());
} }
new_excerpts.push_tree(cursor.suffix(&()), &()); new_excerpts.push_tree(cursor.suffix(&()), &());