Mercurial > vim
changeset 22377:b2cb2a321af9 v8.2.1737
patch 8.2.1737: cursor line highlight in popup window is not always updated
Commit: https://github.com/vim/vim/commit/10476521f51d5902d191f2189307781fc48a3a16
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 24 22:57:31 2020 +0200
patch 8.2.1737: cursor line highlight in popup window is not always updated
Problem: Cursor line highlight in popup window is not always updated.
Solution: Check if the cursor has moved. (closes https://github.com/vim/vim/issues/7010)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 24 Sep 2020 23:00:04 +0200 |
parents | 6820ccdb87df |
children | 61c93dd752ad |
files | src/popupwin.c src/testdir/dumps/Test_popupwin_win_execute_cursorline.dump src/testdir/test_popupwin.vim src/version.c |
diffstat | 4 files changed, 50 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -3711,6 +3711,11 @@ update_popups(void (*win_update)(win_T * // Draw the popup text, unless it's off screen. if (wp->w_winrow < screen_Rows && wp->w_wincol < screen_Columns) { + // May need to update the "cursorline" highlighting, which may also + // change "topline" + if (wp->w_popup_last_curline != wp->w_cursor.lnum) + popup_highlight_curline(wp); + win_update(wp); // move the cursor into the visible lines, otherwise executing
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_win_execute_cursorline.dump @@ -0,0 +1,14 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @34|1+0#0000001#ffd7ff255|4| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@35 +|~| @34|1+0#0000001#ffd7ff255|5| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@35 +|~| @34|1+0#0000001#ffd7ff255|6| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@35 +|~| @34|1+0#0000001#e0e0e08|7| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@35 +|~| @34|1+0#0000001#ffd7ff255|8| +0#0000000#0000001| +0#4040ff13#ffffff0@35 +|~| @34|1+0#0000001#ffd7ff255|9| +0#0000000#0000001| +0#4040ff13#ffffff0@35 +|~| @34|2+0#0000001#ffd7ff255|0| +0#0000000#0000001| +0#4040ff13#ffffff0@35 +|~| @34|2+0#0000001#ffd7ff255|1| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@35 +|~| @34|2+0#0000001#ffd7ff255@1| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@35 +|~| @73 +|~| @73 +|:+0#0000000&| @55|0|,|0|-|1| @8|A|l@1|
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1556,16 +1556,41 @@ func Test_popup_filter_normal_cmd() call delete('XtestPopupNormal') endfunc +" test that cursor line highlight is updated after using win_execute() +func Test_popup_filter_win_execute() + CheckScreendump + + let lines =<< trim END + let lines = range(1, &lines * 2)->map({_, v -> string(v)}) + let g:id = popup_create(lines, #{ + \ minheight: &lines - 5, + \ maxheight: &lines - 5, + \ cursorline: 1, + \ }) + redraw + END + call writefile(lines, 'XtestPopupWinExecute') + let buf = RunVimInTerminal('-S XtestPopupWinExecute', #{rows: 14}) + + call term_sendkeys(buf, ":call win_execute(g:id, ['normal 17Gzz'])\<CR>") + call term_sendkeys(buf, ":\<CR>") + + call VerifyScreenDump(buf, 'Test_popupwin_win_execute_cursorline', {}) + + call StopVimInTerminal(buf) + call delete('XtestPopupWinExecute') +endfunc + " this tests that we don't get stuck with an error in "win_execute()" -func Test_popup_filter_win_execute() +func Test_popup_filter_win_execute_error() CheckScreendump let lines =<< trim END let g:winid = popup_create('some text', {'filter': 'invalidfilter'}) call timer_start(0, {-> win_execute(g:winid, 'invalidCommand')}) END - call writefile(lines, 'XtestPopupWinExecute') - let buf = RunVimInTerminal('-S XtestPopupWinExecute', #{rows: 10, wait_for_ruler: 0}) + call writefile(lines, 'XtestPopupWinExecuteError') + let buf = RunVimInTerminal('-S XtestPopupWinExecuteError', #{rows: 10, wait_for_ruler: 0}) call WaitFor({-> term_getline(buf, 9) =~ 'Not an editor command: invalidCommand'}) call term_sendkeys(buf, "\<CR>") @@ -1577,7 +1602,7 @@ func Test_popup_filter_win_execute() call VerifyScreenDump(buf, 'Test_popupwin_win_execute', {}) call StopVimInTerminal(buf) - call delete('XtestPopupWinExecute') + call delete('XtestPopupWinExecuteError') endfunc func ShowDialog(key, result)