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

Fix warnings/errors now that AsyncAppContext::update returns Result

Browse source
This commit is contained in:
Antonio Scandurra 2023-04-18 14:58:57 +02:00
parent 31e6bb4fc1
commit d03c431f9a
33 changed files with 494 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/editor/src/items.rs
View file

@ -80,7 +80,9 @@ impl FollowableItem for Editor {
})
});
let editor = editor.unwrap_or_else(|| {
let editor = if let Some(editor) = editor {
editor
} else {
pane.update(&mut cx, |_, cx| {
let multibuffer = cx.add_model(|cx| {
let mut multibuffer;
@ -116,8 +118,8 @@ impl FollowableItem for Editor {
});
cx.add_view(|cx| Editor::for_multibuffer(multibuffer, Some(project), cx))
})
});
})?
};
editor.update(&mut cx, |editor, cx| {
editor.remote_id = Some(remote_id);
@ -154,7 +156,7 @@ impl FollowableItem for Editor {
}
anyhow::Ok(())
})?;
})??;
Ok(editor)
}))
@ -387,7 +389,7 @@ impl FollowableItem for Editor {
offset: vec2f(message.scroll_x, message.scroll_y)
}, cx);
}
});
})?;
Ok(())
})
}
@ -670,7 +672,7 @@ impl Item for Editor {
let transaction = reload_buffers.log_err().await;
this.update(&mut cx, |editor, cx| {
editor.request_autoscroll(Autoscroll::fit(), cx)
});
})?;
buffer.update(&mut cx, |buffer, _| {
if let Some(transaction) = transaction {
if !buffer.is_singleton() {