Mercurial > vim
changeset 22361:00f2eebe74d9 v8.2.1729
patch 8.2.1729: endless loop when ":normal" feeds popup window filter
Commit: https://github.com/vim/vim/commit/189832bf661168df7ebd428e4088737718775fbd
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Sep 23 12:29:11 2020 +0200
patch 8.2.1729: endless loop when ":normal" feeds popup window filter
Problem: Endless loop when ":normal" feeds popup window filter.
Solution: Add the ex_normal_busy_done flag.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 23 Sep 2020 12:30:04 +0200 |
parents | d55224e63208 |
children | 90bc9923a1df |
files | src/evalfunc.c src/ex_docmd.c src/getchar.c src/globals.h src/menu.c src/testdir/dumps/Test_popupwin_normal_cmd.dump src/testdir/test_popupwin.vim src/version.c |
diffstat | 8 files changed, 53 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2610,7 +2610,13 @@ f_feedkeys(typval_T *argvars, typval_T * ++ex_normal_busy; exec_normal(TRUE, lowlevel, TRUE); if (!dangerous) + { --ex_normal_busy; +#ifdef FEAT_PROP_POPUP + if (ex_normal_busy == 0) + ex_normal_busy_done = FALSE; +#endif + } msg_scroll |= save_msg_scroll; }
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -8030,6 +8030,10 @@ ex_normal(exarg_T *eap) restore_current_state(&save_state); --ex_normal_busy; +#ifdef FEAT_PROP_POPUP + if (ex_normal_busy == 0) + ex_normal_busy_done = FALSE; +#endif setmouse(); #ifdef CURSOR_SHAPE ui_cursor_shape(); // may show different cursor shape
--- a/src/getchar.c +++ b/src/getchar.c @@ -1888,7 +1888,7 @@ vgetc(void) } #endif #ifdef FEAT_PROP_POPUP - if (popup_do_filter(c)) + if (!ex_normal_busy_done && popup_do_filter(c)) { if (c == Ctrl_C) got_int = FALSE; // avoid looping @@ -3168,6 +3168,10 @@ vgetorpeek(int advance) timedout = TRUE; continue; } +#ifdef FEAT_PROP_POPUP + ex_normal_busy_done = TRUE; +#endif + // When 'insertmode' is set, ESC just beeps in Insert // mode. Use CTRL-L to make edit() return. // For the command line only CTRL-C always breaks it.
--- a/src/globals.h +++ b/src/globals.h @@ -1152,6 +1152,11 @@ EXTERN typebuf_T typebuf // typeahead b ; EXTERN int ex_normal_busy INIT(= 0); // recursiveness of ex_normal() EXTERN int ex_normal_lock INIT(= 0); // forbid use of ex_normal() +#ifdef FEAT_PROP_POPUP +// Set to TRUE when ex_normal_busy is set and out of typeahead. +EXTERN int ex_normal_busy_done INIT(= FALSE); +#endif + #ifdef FEAT_EVAL EXTERN int ignore_script INIT(= FALSE); // ignore script input #endif
--- a/src/menu.c +++ b/src/menu.c @@ -2398,6 +2398,10 @@ execute_menu(exarg_T *eap, vimmenu_T *me menu->silent[idx]); restore_current_state(&save_state); --ex_normal_busy; +#ifdef FEAT_PROP_POPUP + if (ex_normal_busy == 0) + ex_normal_busy_done = FALSE; +#endif } else ins_typebuf(menu->strings[idx], menu->noremap[idx], 0,
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_normal_cmd.dump @@ -0,0 +1,10 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @31| +0#0000000&@8| +0#4040ff13&@32 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|0|,|0|-|1| @8|A|l@1|
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1539,6 +1539,23 @@ func Test_popup_filter() call popup_clear() endfunc +" this tests that the "ex_normal_busy_done" flag works +func Test_popup_filter_normal_cmd() + CheckScreendump + + let lines =<< trim END + let g:winid = popup_create('some text', {'filter': 'invalidfilter'}) + call timer_start(0, {-> win_execute(g:winid, 'norm! zz')}) + END + call writefile(lines, 'XtestPopupNormal') + let buf = RunVimInTerminal('-S XtestPopupNormal', #{rows: 10}) + call TermWait(buf, 100) + call VerifyScreenDump(buf, 'Test_popupwin_normal_cmd', {}) + + call StopVimInTerminal(buf) + call delete('XtestPopupNormal') +endfunc + func ShowDialog(key, result) let s:cb_res = 999 let winid = popup_dialog('do you want to quit (Yes/no)?', #{