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

Maintain remote buffers via UpdateBufferFile messages sent by host

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-24 09:32:40 +01:00
parent da13d028a3
commit 4372fe1ed0
4 changed files with 115 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -668,10 +668,14 @@ impl Buffer {
&mut self,
new_file: Box<dyn File>,
cx: &mut ModelContext<Self>,
) -> Option<Task<()>> {
let old_file = self.file.as_ref()?;
) -> Task<()> {
let old_file = if let Some(file) = self.file.as_ref() {
file
} else {
return Task::ready(());
};
let mut file_changed = false;
let mut task = None;
let mut task = Task::ready(());
if new_file.path() != old_file.path() {
file_changed = true;
@ -690,7 +694,7 @@ impl Buffer {
file_changed = true;
if !self.is_dirty() {
task = Some(cx.spawn(|this, mut cx| {
task = cx.spawn(|this, mut cx| {
async move {
let new_text = this.read_with(&cx, |this, cx| {
this.file
@ -714,7 +718,7 @@ impl Buffer {
}
.log_err()
.map(drop)
}));
});
}
}
}