andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

remove Callback::Compositor variant

Browse Source 
To reduce likelihood of accidental discarding of important callbacks
This commit is contained in:
Skyler Hawthorne 2022-09-02 23:38:38 -04:00
parent b3fc31a211
commit b530a86d1f
5 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-term/src/application.rs
View File

@ -991,7 +991,7 @@ pub async fn close(&mut self) -> anyhow::Result<()> {
let mut result = match self
.jobs
.finish(Some(&mut self.editor), Some(&mut self.compositor))
.finish(&mut self.editor, Some(&mut self.compositor))
.await
{
Ok(_) => Ok(()),

6
helix-term/src/commands/dap.rs
View File

@ -277,7 +277,8 @@ pub fn dap_launch(cx: &mut Context) {
let completions = template.completion.clone();
let name = template.name.clone();
let callback = Box::pin(async move {
let call: Callback = Callback::Compositor(Box::new(move |compositor| {
let call: Callback =
Callback::EditorCompositor(Box::new(move |_editor, compositor| {
let prompt = debug_parameter_prompt(completions, name, Vec::new());
compositor.push(Box::new(prompt));
}));
@ -335,7 +336,8 @@ fn debug_parameter_prompt(
let config_name = config_name.clone();
let params = params.clone();
let callback = Box::pin(async move {
let call: Callback = Callback::Compositor(Box::new(move |compositor| {
let call: Callback =
Callback::EditorCompositor(Box::new(move |_editor, compositor| {
let prompt = debug_parameter_prompt(completions, config_name, params);
compositor.push(Box::new(prompt));
}));

4
helix-term/src/compositor.rs
View File

@ -31,9 +31,7 @@ impl<'a> Context<'a> {
/// Waits on all pending jobs, and then tries to flush all pending write
/// operations for all documents.
pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
tokio::task::block_in_place(|| {
helix_lsp::block_on(self.jobs.finish(Some(self.editor), None))
})?;
tokio::task::block_in_place(|| helix_lsp::block_on(self.jobs.finish(self.editor, None)))?;
for doc in &mut self.editor.documents.values_mut() {
tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))

20
helix-term/src/job.rs
View File

@ -8,7 +8,6 @@
pub enum Callback {
EditorCompositor(Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>),
Editor(Box<dyn FnOnce(&mut Editor) + Send>),
Compositor(Box<dyn FnOnce(&mut Compositor) + Send>),
}
pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;
@ -76,7 +75,6 @@ pub fn handle_callback(
Ok(Some(call)) => match call {
Callback::EditorCompositor(call) => call(editor, compositor),
Callback::Editor(call) => call(editor),
Callback::Compositor(call) => call(compositor),
},
Err(e) => {
editor.set_error(format!("Async job failed: {}", e));
@ -102,7 +100,7 @@ pub fn add(&self, j: Job) {
/// Blocks until all the jobs that need to be waited on are done.
pub async fn finish(
&mut self,
mut editor: Option<&mut Editor>,
editor: &mut Editor,
mut compositor: Option<&mut Compositor>,
) -> anyhow::Result<()> {
log::debug!("waiting on jobs...");
@ -117,20 +115,10 @@ pub async fn finish(
// clippy doesn't realize this is an error without the derefs
#[allow(clippy::needless_option_as_deref)]
match callback {
Callback::EditorCompositor(call)
if editor.is_some() && compositor.is_some() =>
{
call(
editor.as_deref_mut().unwrap(),
compositor.as_deref_mut().unwrap(),
)
}
Callback::Editor(call) if editor.is_some() => {
call(editor.as_deref_mut().unwrap())
}
Callback::Compositor(call) if compositor.is_some() => {
call(compositor.as_deref_mut().unwrap())
Callback::EditorCompositor(call) if compositor.is_some() => {
call(editor, compositor.as_deref_mut().unwrap())
}
Callback::Editor(call) => call(editor),
// skip callbacks for which we don't have the necessary references
_ => (),

3
helix-term/src/ui/editor.rs
View File

@ -945,7 +945,8 @@ fn handle_keymap_event(
// TODO: Use an on_mode_change hook to remove signature help
cxt.jobs.callback(async {
let call: job::Callback = Callback::Compositor(Box::new(|compositor| {
let call: job::Callback =
Callback::EditorCompositor(Box::new(|_editor, compositor| {
compositor.remove(SignatureHelp::ID);
}));
Ok(call)