mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 17:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

eventloop: restore redraw in cmdline K_EVENT handler

Browse Source 
Restores behavior from commit: 02e86ef04cc1
This commit is contained in:
Justin M. Keyes
2017-09-02 11:35:48 +02:00
parent d47b538f39
commit 6c53c3ee55
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/ex_getln.c
View File

@@ -441,7 +441,8 @@ static int command_line_execute(VimState *state, int key)
if (s->c == K_EVENT) {
multiqueue_process_events(main_loop.events);
return command_line_not_changed(s);
redrawcmdline();
return 1;
}
if (KeyTyped) {

34
test/functional/terminal/tui_spec.lua
View File

@@ -260,8 +260,8 @@ describe('tui FocusGained/FocusLost', function()
end)
end)
-- per 5cc87d4dabd02167117be7a978b5c8faaa975419 we decided to ignore :echo
-- invoked from timers/events while the user is in cmdline-mode.
-- During cmdline-mode we ignore :echo invoked by timers/events.
-- See commit: 5cc87d4dabd02167117be7a978b5c8faaa975419.
it('in cmdline-mode does NOT :echo', function()
feed_data(':')
feed_data('\027[I')
@@ -286,7 +286,35 @@ describe('tui FocusGained/FocusLost', function()
]])
end)
it('can handle focus events in terminal mode', function()
it('in cmdline-mode', function()
-- Set up autocmds that modify the buffer, instead of just calling :echo.
-- This is how we can test handling of focus gained/lost during cmdline-mode.
-- See commit: 5cc87d4dabd02167117be7a978b5c8faaa975419.
feed_data(":autocmd!\n")
feed_data(":autocmd FocusLost * call append(line('$'), 'lost')\n")
feed_data(":autocmd FocusGained * call append(line('$'), 'gained')\n")
-- Enter cmdline-mode.
feed_data(':')
screen:sleep(10)
-- Send focus lost/gained termcodes.
feed_data('\027[O')
feed_data('\027[I')
screen:sleep(10)
-- Exit cmdline-mode. Redraws from timers/events are blocked during
-- cmdline-mode, so the buffer won't be updated until we exit cmdline-mode.
feed_data('\n')
screen:expect([[
{1: } |
lost |
gained |
{4:~ }|
{5:[No Name] [+] }|
: |
{3:-- TERMINAL --} |
]])
end)
it('in terminal-mode', function()
feed_data(':set shell='..nvim_dir..'/shell-test\n')
feed_data(':set noshowmode laststatus=0\n')