aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.1.1899: sign_place() does not work as documented

Browse Source 
Problem:    sign_place() does not work as documented.
Solution:   Make accept line numbers like line(). (Yegappan Lakshmanan,
            closes #4848)
This commit is contained in:
Bram Moolenaar
2019-08-21 13:20:29 +02:00
parent 4dc8f498aa
commit 42aff46d97
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sign.c
View File

@@ -2430,10 +2430,13 @@ sign_place_from_dict(
di = dict_find(dict, (char_u *)"lnum", -1);
if (di != NULL)
{
lnum = (int)tv_get_number_chk(&di->di_tv, &notanum);
if (notanum)
lnum = tv_get_lnum(&di->di_tv);
if (lnum <= 0)
{
emsg(_(e_invarg));
goto cleanup;
}
}
// sign priority
di = dict_find(dict, (char_u *)"priority", -1);

24
src/testdir/test_signs.vim
View File

@@ -457,11 +457,11 @@ func Test_sign_funcs()
call assert_fails('call sign_place(5, "", "sign1", [], {"lnum" : 10})',
\ 'E158:')
call assert_fails('call sign_place(21, "", "sign1", "Xsign",
\ {"lnum" : -1})', 'E885:')
\ {"lnum" : -1})', 'E474:')
call assert_fails('call sign_place(22, "", "sign1", "Xsign",
\ {"lnum" : 0})', 'E885:')
\ {"lnum" : 0})', 'E474:')
call assert_fails('call sign_place(22, "", "sign1", "Xsign",
\ {"lnum" : []})', 'E745:')
\ {"lnum" : []})', 'E474:')
call assert_equal(-1, sign_place(1, "*", "sign1", "Xsign", {"lnum" : 10}))
" Tests for sign_getplaced()
@@ -517,6 +517,16 @@ func Test_sign_funcs()
call assert_fails('call sign_undefine("none")', 'E155:')
call assert_fails('call sign_undefine({})', 'E731:')
" Test for using '.' as the line number for sign_place()
call sign_define("sign1", attr)
call cursor(22, 1)
call assert_equal(15, sign_place(15, '', 'sign1', 'Xsign',
\ {'lnum' : '.'}))
call assert_equal([{'bufnr' : bufnr(''), 'signs' :
\ [{'id' : 15, 'group' : '', 'lnum' : 22, 'name' : 'sign1',
\ 'priority' : 10}]}],
\ sign_getplaced('%', {'lnum' : 22}))
call delete("Xsign")
call sign_unplace('*')
call sign_undefine()
@@ -1928,6 +1938,14 @@ func Test_sign_funcs_multi()
call assert_equal([{'id' : 5, 'name' : 'sign1', 'lnum' : 11,
\ 'group' : '', 'priority' : 10}], s[0].signs)
" Place a sign using '.' as the line number
call cursor(23, 1)
call assert_equal([7], sign_placelist([
\ {'id' : 7, 'name' : 'sign1', 'buffer' : '%', 'lnum' : '.'}]))
let s = sign_getplaced('%', {'lnum' : '.'})
call assert_equal([{'id' : 7, 'name' : 'sign1', 'lnum' : 23,
\ 'group' : '', 'priority' : 10}], s[0].signs)
" Place sign without a sign name
call assert_equal([-1], sign_placelist([{'id' : 10, 'buffer' : 'Xsign',
\ 'lnum' : 12, 'group' : ''}]))

2
src/version.c
View File

@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1899,
/**/
1898,
/**/