diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-02-02 21:52:01 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-02 21:52:01 +0800 |
commit | 9b7cf4f0beb35b640846f92ac522372967ca6695 (patch) | |
tree | f127d978d11c38311880c2acab94b05be8ee00e2 | |
parent | e98decf9a68e41b09214aa60b77d0db29b7d648a (diff) | |
download | rneovim-9b7cf4f0beb35b640846f92ac522372967ca6695.tar.gz rneovim-9b7cf4f0beb35b640846f92ac522372967ca6695.tar.bz2 rneovim-9b7cf4f0beb35b640846f92ac522372967ca6695.zip |
fix(vim.system): don't process non-fast events during wait() (#27300)
Problem:
Processing non-fast events during SystemObj:wait() may cause two pieces
of code to interfere with each other, and is different from jobwait().
Solution:
Don't process non-fast events during SystemObj:wait().
-rw-r--r-- | runtime/lua/vim/_system.lua | 4 | ||||
-rw-r--r-- | test/functional/lua/system_spec.lua | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua index efad3f88cf..e97a5fc6c3 100644 --- a/runtime/lua/vim/_system.lua +++ b/runtime/lua/vim/_system.lua @@ -94,14 +94,14 @@ function SystemObj:wait(timeout) local done = vim.wait(timeout or state.timeout or MAX_TIMEOUT, function() return state.result ~= nil - end) + end, nil, true) if not done then -- Send sigkill since this cannot be caught self:_timeout(SIG.KILL) vim.wait(timeout or state.timeout or MAX_TIMEOUT, function() return state.result ~= nil - end) + end, nil, true) end return state.result diff --git a/test/functional/lua/system_spec.lua b/test/functional/lua/system_spec.lua index bae8322b43..cb561f0771 100644 --- a/test/functional/lua/system_spec.lua +++ b/test/functional/lua/system_spec.lua @@ -104,4 +104,18 @@ describe('vim.system', function() assert(signal == 2) ]]) end) + + it('SystemObj:wait() does not process non-fast events #27292', function() + eq( + false, + exec_lua([[ + _G.processed = false + local cmd = vim.system({ 'sleep', '1' }) + vim.schedule(function() _G.processed = true end) + cmd:wait() + return _G.processed + ]]) + ) + eq(true, exec_lua([[return _G.processed]])) + end) end) |