patch 8.1.1513: all popup functionality is in functions, except :popupclear
Problem: All popup functionality is in functions, except :popupclear.
Solution: Add popup_clear() for consistency. Also rename sound_stopall() to
sound_clear().
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index f275a49..51eed30 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -61,7 +61,7 @@
call term_wait(buf)
call term_sendkeys(buf, "0")
call term_wait(buf)
- call term_sendkeys(buf, ":popupclear\<CR>")
+ call term_sendkeys(buf, ":call popup_clear()\<CR>")
call VerifyScreenDump(buf, 'Test_popupwin_08', {})
" clean up
@@ -271,7 +271,7 @@
call assert_equal(0, popup_getpos(winid).visible)
quit
call assert_equal(1, popup_getpos(winid).visible)
- popupclear
+ call popup_clear()
" global popup is visible in any tab
let winid = popup_create("text", {'tab': -1})
@@ -280,7 +280,7 @@
call assert_equal(1, popup_getpos(winid).visible)
quit
call assert_equal(1, popup_getpos(winid).visible)
- popupclear
+ call popup_clear()
endfunc
func Test_popup_valid_arguments()
@@ -288,13 +288,13 @@
let winid = popup_create("text", {"col": 0})
let pos = popup_getpos(winid)
call assert_inrange(&columns / 2 - 1, &columns / 2 + 1, pos.col)
- popupclear
+ call popup_clear()
" using cursor column has minimum value of 1
let winid = popup_create("text", {"col": 'cursor-100'})
let pos = popup_getpos(winid)
call assert_equal(1, pos.col)
- popupclear
+ call popup_clear()
" center
let winid = popup_create("text", {"pos": 'center'})
@@ -303,57 +303,57 @@
call assert_inrange(around - 1, around + 1, pos.col)
let around = (&lines - pos.height) / 2
call assert_inrange(around - 1, around + 1, pos.line)
- popupclear
+ call popup_clear()
endfunc
func Test_popup_invalid_arguments()
call assert_fails('call popup_create(666, {})', 'E714:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", "none")', 'E715:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"col": "xxx"})', 'E475:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"col": "cursor8"})', 'E15:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"col": "cursor+x"})', 'E15:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"col": "cursor+8x"})', 'E15:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"line": "xxx"})', 'E475:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"line": "cursor8"})', 'E15:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"line": "cursor+x"})', 'E15:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"line": "cursor+8x"})', 'E15:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"pos": "there"})', 'E475:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"padding": "none"})', 'E714:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"border": "none"})', 'E714:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"borderhighlight": "none"})', 'E714:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create("text", {"borderchars": "none"})', 'E714:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create([{"text": "text"}, 666], {})', 'E715:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create([{"text": "text", "props": "none"}], {})', 'E714:')
- popupclear
+ call popup_clear()
call assert_fails('call popup_create([{"text": "text", "props": ["none"]}], {})', 'E715:')
- popupclear
+ call popup_clear()
endfunc
func Test_win_execute_closing_curwin()
split
let winid = popup_create('some text', {})
call assert_fails('call win_execute(winid, winnr() .. "close")', 'E994')
- popupclear
+ call popup_clear()
endfunc
func Test_win_execute_not_allowed()
@@ -374,7 +374,7 @@
call assert_fails('call win_execute(winid, "wincmd w")', 'E994:')
call assert_fails('call win_execute(winid, "wincmd t")', 'E994:')
call assert_fails('call win_execute(winid, "wincmd b")', 'E994:')
- popupclear
+ call popup_clear()
endfunc
func Test_popup_with_wrap()
@@ -770,7 +770,7 @@
call assert_equal(-1, winbufnr(winid))
delfunc MyPopupFilter
- popupclear
+ call popup_clear()
endfunc
func Test_popup_close_callback()
@@ -944,7 +944,7 @@
endfor
endfor
- popupclear
+ call popup_clear()
%bwipe!
endfunc
@@ -1010,7 +1010,7 @@
call popup_close( p )
redraw
- popupclear
+ call popup_clear()
%bwipe!
endfunc
@@ -1026,7 +1026,7 @@
" trigger the check for last_cursormoved by going into insert mode
call feedkeys("li\<Esc>", 'xt')
call assert_equal({}, popup_getpos(winid))
- popupclear
+ call popup_clear()
exe "normal gg0/word\<CR>"
let winid = popup_atcursor('text', {'moved': 'word'})
@@ -1034,7 +1034,7 @@
call assert_equal(1, popup_getpos(winid).visible)
call feedkeys("hi\<Esc>", 'xt')
call assert_equal({}, popup_getpos(winid))
- popupclear
+ call popup_clear()
exe "normal gg0/word\<CR>"
let winid = popup_atcursor('text', {'moved': 'word'})
@@ -1046,7 +1046,7 @@
call assert_equal(1, popup_getpos(winid).visible)
call feedkeys("eli\<Esc>", 'xt')
call assert_equal({}, popup_getpos(winid))
- popupclear
+ call popup_clear()
" WORD is the default
exe "normal gg0/WORD\<CR>"
@@ -1059,7 +1059,7 @@
call assert_equal(1, popup_getpos(winid).visible)
call feedkeys("Eli\<Esc>", 'xt')
call assert_equal({}, popup_getpos(winid))
- popupclear
+ call popup_clear()
exe "normal gg0/word\<CR>"
let winid = popup_atcursor('text', {'moved': [5, 10]})
@@ -1070,7 +1070,7 @@
call assert_equal(1, popup_getpos(winid).visible)
call feedkeys("eli\<Esc>", 'xt')
call assert_equal({}, popup_getpos(winid))
- popupclear
+ call popup_clear()
bwipe!
call test_override('ALL', 0)