mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 06:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0679: sign functions do not take buffer argument as documented

Browse Source 
Problem:    Sign functions do not take buffer argument as documented.
Solution:   Use get_buf_tv(). (Yegappan Lakshmanan, closes vim/vim#3755)
2cbc1a02cb
This commit is contained in:
Andrej Zieger
2019-05-19 18:38:25 +02:00
parent 83025f0028
commit 54c4567564
2 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval.c
View File

@@ -15507,7 +15507,7 @@ f_sign_getplaced(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type != VAR_UNKNOWN)
{
// get signs placed in this buffer
buf = find_buffer(&argvars[0]);
buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL)
{
EMSG2(_("E158: Invalid buffer name: %s"),
@@ -15599,7 +15599,7 @@ f_sign_place(typval_T *argvars, typval_T *rettv)
goto cleanup;
// Buffer to place the sign
buf = find_buffer(&argvars[3]);
buf = tv_get_buf(&argvars[3], FALSE);
if (buf == NULL)
{
EMSG2(_("E158: Invalid buffer name: %s"), tv_get_string(&argvars[2]));
@@ -15708,7 +15708,7 @@ f_sign_unplace(typval_T *argvars, typval_T *rettv)
if ((di = tv_dict_find(dict, (char_u *)"buffer", -1)) != NULL)
{
buf = find_buffer(&di->di_tv);
buf = tv_get_buf(&di->di_tv, FALSE);
if (buf == NULL)
{
EMSG2(_("E158: Invalid buffer name: %s"),

69
src/nvim/testdir/test_signs.vim
View File

@@ -386,11 +386,11 @@ func Test_sign_funcs()
call assert_equal([{'bufnr' : bufnr(''), 'signs' :
\ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1',
\ 'priority' : 10}]}],
\ sign_getplaced('Xsign', {'lnum' : 20}))
\ sign_getplaced('%', {'lnum' : 20}))
call assert_equal([{'bufnr' : bufnr(''), 'signs' :
\ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1',
\ 'priority' : 10}]}],
\ sign_getplaced('Xsign', {'id' : 10}))
\ sign_getplaced('', {'id' : 10}))
" Tests for invalid arguments to sign_place()
call assert_fails('call sign_place([], "", "mySign", 1)', 'E745:')
@@ -407,7 +407,7 @@ func Test_sign_funcs()
\ {"lnum" : 30})', 'E730:')
call assert_fails('call sign_place(5, "", "sign1", "abcxyz.xxx",
\ {"lnum" : 10})', 'E158:')
call assert_fails('call sign_place(5, "", "sign1", "", {"lnum" : 10})',
call assert_fails('call sign_place(5, "", "sign1", "@", {"lnum" : 10})',
\ 'E158:')
call assert_fails('call sign_place(5, "", "sign1", [], {"lnum" : 10})',
\ 'E158:')
@@ -429,7 +429,7 @@ func Test_sign_funcs()
\ 'priority' : 10}]}],
\ sign_getplaced())
call assert_fails("call sign_getplaced('dummy.sign')", 'E158:')
call assert_fails('call sign_getplaced("")', 'E158:')
call assert_fails('call sign_getplaced("&")', 'E158:')
call assert_fails('call sign_getplaced(-1)', 'E158:')
call assert_fails('call sign_getplaced("Xsign", [])', 'E715:')
call assert_equal([{'bufnr' : bufnr(''), 'signs' : []}],
@@ -451,7 +451,7 @@ func Test_sign_funcs()
call assert_fails("call sign_unplace('',
\ {'id' : 20, 'buffer' : 'buffer.c'})", 'E158:')
call assert_fails("call sign_unplace('',
\ {'id' : 20, 'buffer' : ''})", 'E158:')
\ {'id' : 20, 'buffer' : '&'})", 'E158:')
call assert_fails("call sign_unplace('g1',
\ {'id' : 20, 'buffer' : 200})", 'E158:')
call assert_fails("call sign_unplace('g1', 'mySign')", 'E715:')
@@ -1186,3 +1186,62 @@ func Test_sign_memfailures()
enew | only
call delete("Xsign")
endfunc
" Test for auto-adjusting the line number of a placed sign.
func Test_sign_lnum_adjust()
enew! | only!
sign define sign1 text=#> linehl=Comment
call setline(1, ['A', 'B', 'C', 'D'])
exe 'sign place 5 line=3 name=sign1 buffer=' . bufnr('')
let l = sign_getplaced(bufnr(''))
call assert_equal(3, l[0].signs[0].lnum)
" Add some lines before the sign and check the sign line number
call append(2, ['AA', 'AB', 'AC'])
let l = sign_getplaced(bufnr(''))
call assert_equal(6, l[0].signs[0].lnum)
" Delete some lines before the sign and check the sign line number
call deletebufline('%', 1, 2)
let l = sign_getplaced(bufnr(''))
call assert_equal(4, l[0].signs[0].lnum)
sign unplace * group=*
sign undefine sign1
enew!
endfunc
" Test for changing the type of a placed sign
func Test_sign_change_type()
enew! | only!
sign define sign1 text=#> linehl=Comment
sign define sign2 text=@@ linehl=Comment
call setline(1, ['A', 'B', 'C', 'D'])
exe 'sign place 4 line=3 name=sign1 buffer=' . bufnr('')
let l = sign_getplaced(bufnr(''))
call assert_equal('sign1', l[0].signs[0].name)
exe 'sign place 4 name=sign2 buffer=' . bufnr('')
let l = sign_getplaced(bufnr(''))
call assert_equal('sign2', l[0].signs[0].name)
call sign_place(4, '', 'sign1', '')
let l = sign_getplaced(bufnr(''))
call assert_equal('sign1', l[0].signs[0].name)
exe 'sign place 4 group=g1 line=4 name=sign1 buffer=' . bufnr('')
let l = sign_getplaced(bufnr(''), {'group' : 'g1'})
call assert_equal('sign1', l[0].signs[0].name)
exe 'sign place 4 group=g1 name=sign2 buffer=' . bufnr('')
let l = sign_getplaced(bufnr(''), {'group' : 'g1'})
call assert_equal('sign2', l[0].signs[0].name)
call sign_place(4, 'g1', 'sign1', '')
let l = sign_getplaced(bufnr(''), {'group' : 'g1'})
call assert_equal('sign1', l[0].signs[0].name)
sign unplace * group=*
sign undefine sign1
sign undefine sign2
enew!
endfunc