mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-27 09:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(jobs): do not block UI when jobwait() doesn't block (#31803)

Browse Source 
(cherry picked from commit efe1732c6f)
This commit is contained in:
Gregory Anders
2025-01-01 18:43:16 -06:00
committed by github-actions[bot]
parent 6a6c6b2658
commit 357ee88606
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/eval/funcs.c
View File

@@ -4562,8 +4562,6 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return;
}
ui_busy_start();
ui_flush();
list_T *args = argvars[0].vval.v_list;
Channel **jobs = xcalloc((size_t)tv_list_len(args), sizeof(*jobs));
MultiQueue *waiting_jobs = multiqueue_new_parent(loop_on_put, &main_loop);
@@ -4600,6 +4598,13 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
before = os_hrtime();
}
// Only mark the UI as busy when jobwait() blocks
const bool busy = remaining != 0;
if (busy) {
ui_busy_start();
ui_flush();
}
for (i = 0; i < tv_list_len(args); i++) {
if (remaining == 0) {
break; // Timeout.
@@ -4641,7 +4646,9 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
multiqueue_free(waiting_jobs);
xfree(jobs);
ui_busy_stop();
if (busy) {
ui_busy_stop();
}
tv_list_ref(rv);
rettv->v_type = VAR_LIST;
rettv->vval.v_list = rv;