patch 8.2.1732: stuck when win_execute() for a popup causes an error
Problem: Stuck when win_execute() for a popup causes an error.
Solution: Disable the filter callback on error. (issue #6999)
diff --git a/src/testdir/dumps/Test_popupwin_win_execute.dump b/src/testdir/dumps/Test_popupwin_win_execute.dump
new file mode 100644
index 0000000..f554859
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_win_execute.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|
diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
index 4a5e649..53735c8 100644
--- a/src/testdir/term_util.vim
+++ b/src/testdir/term_util.vim
@@ -5,6 +5,8 @@
finish
endif
+source shared.vim
+
" For most tests we need to be able to run terminal Vim with 256 colors. On
" MS-Windows the console only has 16 colors and the GUI can't run in a
" terminal.
@@ -51,6 +53,7 @@
" "rows" - height of the terminal window (max. 20)
" "cols" - width of the terminal window (max. 78)
" "statusoff" - number of lines the status is offset from default
+" "wait_for_ruler" - if zero then don't wait for ruler to show
func RunVimInTerminal(arguments, options)
" If Vim doesn't exit a swap file remains, causing other tests to fail.
" Remove it here.
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 6607ea2..79eaca7 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1556,6 +1556,30 @@
call delete('XtestPopupNormal')
endfunc
+" this tests that we don't get stuck with an error in "win_execute()"
+func Test_popup_filter_win_execute()
+ 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 WaitFor({-> term_getline(buf, 9) =~ 'Not an editor command: invalidCommand'})
+ call term_sendkeys(buf, "\<CR>")
+ call WaitFor({-> term_getline(buf, 9) =~ 'Unknown function: invalidfilter'})
+ call term_sendkeys(buf, "\<CR>")
+ call WaitFor({-> term_getline(buf, 9) =~ 'Not allowed in a popup window'})
+ call term_sendkeys(buf, "\<CR>")
+ call term_sendkeys(buf, "\<CR>")
+ call VerifyScreenDump(buf, 'Test_popupwin_win_execute', {})
+
+ call StopVimInTerminal(buf)
+ call delete('XtestPopupWinExecute')
+endfunc
+
func ShowDialog(key, result)
let s:cb_res = 999
let winid = popup_dialog('do you want to quit (Yes/no)?', #{