Mercurial > vim

comparison src/testdir/test_signs.vim @ 15343:8543eaf63f65 v8.1.0679

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0679: sign functions do not take buffer argument as documented commit https://github.com/vim/vim/commit/2cbc1a02cb72916dfdbd0d307512c7c3fb766edf Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 2 13:40:31 2019 +0100 patch 8.1.0679: sign functions do not take buffer argument as documented Problem: Sign functions do not take buffer argument as documented. Solution: Use get_buf_tv(). (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/3755)
author Bram Moolenaar <Bram@vim.org>
date Wed, 02 Jan 2019 13:45:06 +0100
parents c6c306c5027f
children 0d76dd701e49
comparison
equal deleted inserted replaced
15342:66d4e6825b64 15343:8543eaf63f65
30 30
31 " Split the window to the bottom to verify sign jump will stay in the 31 " Split the window to the bottom to verify sign jump will stay in the
32 " current window if the buffer is displayed there. 32 " current window if the buffer is displayed there.
33 let bn = bufnr('%') 33 let bn = bufnr('%')
34 let wn = winnr() 34 let wn = winnr()
35 exe 'sign place 41 line=3 name=Sign1 buffer=' . bn 35 exe 'sign place 41 line=3 name=Sign1 buffer=' . bn
36 1 36 1
37 bot split 37 bot split
38 exe 'sign jump 41 buffer=' . bufnr('%') 38 exe 'sign jump 41 buffer=' . bufnr('%')
39 call assert_equal('c', getline('.')) 39 call assert_equal('c', getline('.'))
40 call assert_equal(3, winnr()) 40 call assert_equal(3, winnr())
75 exe 'sign place 42 line=4 name=Sign2 buffer=' . bufnr('%') 75 exe 'sign place 42 line=4 name=Sign2 buffer=' . bufnr('%')
76 4 76 4
77 sign unplace 77 sign unplace
78 let a=execute('sign place') 78 let a=execute('sign place')
79 call assert_equal("\n--- Signs ---\n", a) 79 call assert_equal("\n--- Signs ---\n", a)
80 80
81 " Try again to unplace sign on current line, it should fail this time. 81 " Try again to unplace sign on current line, it should fail this time.
82 call assert_fails('sign unplace', 'E159:') 82 call assert_fails('sign unplace', 'E159:')
83 83
84 " Unplace all signs. 84 " Unplace all signs.
85 exe 'sign place 41 line=3 name=Sign1 buffer=' . bufnr('%') 85 exe 'sign place 41 line=3 name=Sign1 buffer=' . bufnr('%')
384 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1', 384 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1',
385 \ 'priority' : 10}]}], sign_getplaced('Xsign')) 385 \ 'priority' : 10}]}], sign_getplaced('Xsign'))
386 call assert_equal([{'bufnr' : bufnr(''), 'signs' : 386 call assert_equal([{'bufnr' : bufnr(''), 'signs' :
387 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1', 387 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1',
388 \ 'priority' : 10}]}], 388 \ 'priority' : 10}]}],
389 \ sign_getplaced('Xsign', {'lnum' : 20})) 389 \ sign_getplaced('%', {'lnum' : 20}))
390 call assert_equal([{'bufnr' : bufnr(''), 'signs' : 390 call assert_equal([{'bufnr' : bufnr(''), 'signs' :
391 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1', 391 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1',
392 \ 'priority' : 10}]}], 392 \ 'priority' : 10}]}],
393 \ sign_getplaced('Xsign', {'id' : 10})) 393 \ sign_getplaced('', {'id' : 10}))
394 394
395 " Tests for invalid arguments to sign_place() 395 " Tests for invalid arguments to sign_place()
396 call assert_fails('call sign_place([], "", "mySign", 1)', 'E745:') 396 call assert_fails('call sign_place([], "", "mySign", 1)', 'E745:')
397 call assert_fails('call sign_place(5, "", "mySign", -1)', 'E158:') 397 call assert_fails('call sign_place(5, "", "mySign", -1)', 'E158:')
398 call assert_fails('call sign_place(-1, "", "sign1", "Xsign", [])', 398 call assert_fails('call sign_place(-1, "", "sign1", "Xsign", [])',
405 \ {"lnum" : 30})', 'E155:') 405 \ {"lnum" : 30})', 'E155:')
406 call assert_fails('call sign_place(10, "", [], "Xsign", 406 call assert_fails('call sign_place(10, "", [], "Xsign",
407 \ {"lnum" : 30})', 'E730:') 407 \ {"lnum" : 30})', 'E730:')
408 call assert_fails('call sign_place(5, "", "sign1", "abcxyz.xxx", 408 call assert_fails('call sign_place(5, "", "sign1", "abcxyz.xxx",
409 \ {"lnum" : 10})', 'E158:') 409 \ {"lnum" : 10})', 'E158:')
410 call assert_fails('call sign_place(5, "", "sign1", "", {"lnum" : 10})', 410 call assert_fails('call sign_place(5, "", "sign1", "@", {"lnum" : 10})',
411 \ 'E158:') 411 \ 'E158:')
412 call assert_fails('call sign_place(5, "", "sign1", [], {"lnum" : 10})', 412 call assert_fails('call sign_place(5, "", "sign1", [], {"lnum" : 10})',
413 \ 'E158:') 413 \ 'E158:')
414 call assert_fails('call sign_place(21, "", "sign1", "Xsign", 414 call assert_fails('call sign_place(21, "", "sign1", "Xsign",
415 \ {"lnum" : -1})', 'E885:') 415 \ {"lnum" : -1})', 'E885:')
427 call assert_equal([{'bufnr' : bufnr(''), 'signs' : 427 call assert_equal([{'bufnr' : bufnr(''), 'signs' :
428 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1', 428 \ [{'id' : 10, 'group' : '', 'lnum' : 20, 'name' : 'sign1',
429 \ 'priority' : 10}]}], 429 \ 'priority' : 10}]}],
430 \ sign_getplaced()) 430 \ sign_getplaced())
431 call assert_fails("call sign_getplaced('dummy.sign')", 'E158:') 431 call assert_fails("call sign_getplaced('dummy.sign')", 'E158:')
432 call assert_fails('call sign_getplaced("")', 'E158:') 432 call assert_fails('call sign_getplaced("&")', 'E158:')
433 call assert_fails('call sign_getplaced(-1)', 'E158:') 433 call assert_fails('call sign_getplaced(-1)', 'E158:')
434 call assert_fails('call sign_getplaced("Xsign", [])', 'E715:') 434 call assert_fails('call sign_getplaced("Xsign", [])', 'E715:')
435 call assert_equal([{'bufnr' : bufnr(''), 'signs' : []}], 435 call assert_equal([{'bufnr' : bufnr(''), 'signs' : []}],
436 \ sign_getplaced('Xsign', {'lnum' : 1000000})) 436 \ sign_getplaced('Xsign', {'lnum' : 1000000}))
437 call assert_fails("call sign_getplaced('Xsign', {'lnum' : []})", 437 call assert_fails("call sign_getplaced('Xsign', {'lnum' : []})",
449 \ {'id' : 30, 'buffer' : 'Xsign'})) 449 \ {'id' : 30, 'buffer' : 'Xsign'}))
450 call sign_place(20, '', 'sign2', 'Xsign', {"lnum" : 30}) 450 call sign_place(20, '', 'sign2', 'Xsign', {"lnum" : 30})
451 call assert_fails("call sign_unplace('', 451 call assert_fails("call sign_unplace('',
452 \ {'id' : 20, 'buffer' : 'buffer.c'})", 'E158:') 452 \ {'id' : 20, 'buffer' : 'buffer.c'})", 'E158:')
453 call assert_fails("call sign_unplace('', 453 call assert_fails("call sign_unplace('',
454 \ {'id' : 20, 'buffer' : ''})", 'E158:') 454 \ {'id' : 20, 'buffer' : '&'})", 'E158:')
455 call assert_fails("call sign_unplace('g1', 455 call assert_fails("call sign_unplace('g1',
456 \ {'id' : 20, 'buffer' : 200})", 'E158:') 456 \ {'id' : 20, 'buffer' : 200})", 'E158:')
457 call assert_fails("call sign_unplace('g1', 'mySign')", 'E715:') 457 call assert_fails("call sign_unplace('g1', 'mySign')", 'E715:')
458 458
459 " Tests for sign_undefine() 459 " Tests for sign_undefine()
1184 call sign_unplace('*') 1184 call sign_unplace('*')
1185 call sign_undefine() 1185 call sign_undefine()
1186 enew | only 1186 enew | only
1187 call delete("Xsign") 1187 call delete("Xsign")
1188 endfunc 1188 endfunc
1189
1190 " Test for auto-adjusting the line number of a placed sign.
1191 func Test_sign_lnum_adjust()
1192 enew! | only!
1193
1194 sign define sign1 text=#> linehl=Comment
1195 call setline(1, ['A', 'B', 'C', 'D'])
1196 exe 'sign place 5 line=3 name=sign1 buffer=' . bufnr('')
1197 let l = sign_getplaced(bufnr(''))
1198 call assert_equal(3, l[0].signs[0].lnum)
1199
1200 " Add some lines before the sign and check the sign line number
1201 call append(2, ['AA', 'AB', 'AC'])
1202 let l = sign_getplaced(bufnr(''))
1203 call assert_equal(6, l[0].signs[0].lnum)
1204
1205 " Delete some lines before the sign and check the sign line number
1206 call deletebufline('%', 1, 2)
1207 let l = sign_getplaced(bufnr(''))
1208 call assert_equal(4, l[0].signs[0].lnum)
1209
1210 sign unplace * group=*
1211 sign undefine sign1
1212 enew!
1213 endfunc
1214
1215 " Test for changing the type of a placed sign
1216 func Test_sign_change_type()
1217 enew! | only!
1218
1219 sign define sign1 text=#> linehl=Comment
1220 sign define sign2 text=@@ linehl=Comment
1221
1222 call setline(1, ['A', 'B', 'C', 'D'])
1223 exe 'sign place 4 line=3 name=sign1 buffer=' . bufnr('')
1224 let l = sign_getplaced(bufnr(''))
1225 call assert_equal('sign1', l[0].signs[0].name)
1226 exe 'sign place 4 name=sign2 buffer=' . bufnr('')
1227 let l = sign_getplaced(bufnr(''))
1228 call assert_equal('sign2', l[0].signs[0].name)
1229 call sign_place(4, '', 'sign1', '')
1230 let l = sign_getplaced(bufnr(''))
1231 call assert_equal('sign1', l[0].signs[0].name)
1232
1233 exe 'sign place 4 group=g1 line=4 name=sign1 buffer=' . bufnr('')
1234 let l = sign_getplaced(bufnr(''), {'group' : 'g1'})
1235 call assert_equal('sign1', l[0].signs[0].name)
1236 exe 'sign place 4 group=g1 name=sign2 buffer=' . bufnr('')
1237 let l = sign_getplaced(bufnr(''), {'group' : 'g1'})
1238 call assert_equal('sign2', l[0].signs[0].name)
1239 call sign_place(4, 'g1', 'sign1', '')
1240 let l = sign_getplaced(bufnr(''), {'group' : 'g1'})
1241 call assert_equal('sign1', l[0].signs[0].name)
1242
1243 sign unplace * group=*
1244 sign undefine sign1
1245 sign undefine sign2
1246 enew!
1247 endfunc