diff options
| -rw-r--r-- | src/nvim/getchar.c | 2 | ||||
| -rw-r--r-- | test/functional/api/vim_spec.lua | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 5bf89ee5a8..0817d40bb8 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1932,7 +1932,7 @@ static void getchar_common(typval_T *argvars, typval_T *rettv, bool allow_number // Flush screen updates before blocking. ui_flush(); input_get(NULL, 0, -1, typebuf.tb_change_cnt, main_loop.events); - if (!multiqueue_empty(main_loop.events)) { + if (!input_available() && !multiqueue_empty(main_loop.events)) { state_handle_k_event(); continue; } diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index dabe3a2c9a..3aa9ba49d5 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -96,12 +96,19 @@ describe('API', function() assert_alive() end) - it('input is processed first when followed immediately by non-fast events', function() + it('input is processed first if followed immediately by non-fast events', function() api.nvim_set_current_line('ab') async_meths.nvim_input('x') async_meths.nvim_exec_lua('_G.res1 = vim.api.nvim_get_current_line()', {}) async_meths.nvim_exec_lua('_G.res2 = vim.api.nvim_get_current_line()', {}) eq({ 'b', 'b' }, exec_lua('return { _G.res1, _G.res2 }')) + -- Also test with getchar() + async_meths.nvim_command('let g:getchar = 1 | call getchar() | let g:getchar = 0') + eq(1, api.nvim_get_var('getchar')) + async_meths.nvim_input('x') + async_meths.nvim_exec_lua('_G.res1 = vim.g.getchar', {}) + async_meths.nvim_exec_lua('_G.res2 = vim.g.getchar', {}) + eq({ 0, 0 }, exec_lua('return { _G.res1, _G.res2 }')) end) it('does not set CA_COMMAND_BUSY #7254', function() |