Patch 8.2.3098

3 views
Skip to first unread message

Bram Moolenaar

unread,
Jul 4, 2021, 8:01:51 AM7/4/21
to vim...@googlegroups.com

Patch 8.2.3098
Problem: Popup window test is flaky on MS-Windows with GUI.
Solution: Skip the check in this situation.
Files: src/testdir/test_popupwin.vim


*** ../vim-8.2.3097/src/testdir/test_popupwin.vim 2021-07-03 21:41:35.121946816 +0200
--- src/testdir/test_popupwin.vim 2021-07-04 13:59:01.033683347 +0200
***************
*** 1550,1573 ****
redraw

" e is consumed by the filter
call feedkeys('e', 'xt')
call assert_equal('e', g:eaten)
call feedkeys("\<F9>", 'xt')
call assert_equal("\<F9>", g:eaten)

" 0 is ignored by the filter
normal $
call assert_equal(9, getcurpos()[2])
call feedkeys('0', 'xt')
call assert_equal('0', g:ignored)
! normal! l
! call assert_equal(2, getcurpos()[2])

" x closes the popup
call feedkeys('x', 'xt')
call assert_equal("\<F9>", g:eaten)
call assert_equal(-1, winbufnr(winid))

delfunc MyPopupFilter
call popup_clear()
endfunc
--- 1550,1581 ----
redraw

" e is consumed by the filter
+ let g:eaten = ''
call feedkeys('e', 'xt')
call assert_equal('e', g:eaten)
call feedkeys("\<F9>", 'xt')
call assert_equal("\<F9>", g:eaten)

" 0 is ignored by the filter
+ let g:ignored = ''
normal $
call assert_equal(9, getcurpos()[2])
call feedkeys('0', 'xt')
call assert_equal('0', g:ignored)
!
! if has('win32') && has('gui_running')
! echo "FIXME: this check is very flaky on MS-Windows GUI, the cursor doesn't move"
! else
! call assert_equal(1, getcurpos()[2])
! endif

" x closes the popup
call feedkeys('x', 'xt')
call assert_equal("\<F9>", g:eaten)
call assert_equal(-1, winbufnr(winid))

+ unlet g:eaten
+ unlet g:ignored
delfunc MyPopupFilter
call popup_clear()
endfunc
*** ../vim-8.2.3097/src/version.c 2021-07-04 13:27:05.968932388 +0200
--- src/version.c 2021-07-04 14:00:30.637515261 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3098,
/**/

--
From "know your smileys":
;-0 Can't find shift key
,-9 Kann Umschalttaste nicht finden

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages