mirror of
https://github.com/neovim/neovim.git
synced 2025-10-14 05:46:12 +00:00
vim-patch:8.1.{1915,1921,1953} (#19900)
vim-patch:8.1.1915: more functions can be used as methods Problem: More functions can be used as methods. Solution: Make various functions usable as a method.1a3a89168d
Move debugbreak() to the right place. vim-patch:8.1.1921: more functions can be used as methods Problem: More functions can be used as methods. Solution: Make various functions usable as a method.a4208966fb
vim-patch:8.1.1953: more functions can be used as a method Problem: More functions can be used as a method. Solution: Allow more functions to be used as a method.f9f24ce7a0
Omit test_termcodes.vim: cannot be used and superseded by later patches. Cherry-pick test_bufline.vim change from patch 8.1.1993.
This commit is contained in:
@@ -294,7 +294,7 @@ func Test_blob_index()
|
||||
call assert_equal(2, index(0zDEADBEEF, 0xBE))
|
||||
call assert_equal(-1, index(0zDEADBEEF, 0))
|
||||
call assert_equal(2, index(0z11111111, 0x11, 2))
|
||||
call assert_equal(3, index(0z11110111, 0x11, 2))
|
||||
call assert_equal(3, 0z11110111->index(0x11, 2))
|
||||
call assert_equal(2, index(0z11111111, 0x11, -2))
|
||||
call assert_equal(3, index(0z11110111, 0x11, -2))
|
||||
|
||||
|
@@ -19,7 +19,7 @@ func Test_setbufline_getbufline()
|
||||
let b = bufnr('%')
|
||||
wincmd w
|
||||
call assert_equal(1, setbufline(b, 5, ['x']))
|
||||
call assert_equal(1, setbufline(bufnr('$') + 1, 1, ['x']))
|
||||
call assert_equal(1, ['x']->setbufline(bufnr('$') + 1, 1))
|
||||
call assert_equal(0, setbufline(b, 4, ['d', 'e']))
|
||||
call assert_equal(['c'], b->getbufline(3))
|
||||
call assert_equal(['d'], getbufline(b, 4))
|
||||
|
@@ -113,7 +113,7 @@ func Test_chdir_func()
|
||||
call assert_equal('z', fnamemodify(3->getcwd(2), ':t'))
|
||||
tabnext | wincmd t
|
||||
call assert_match('^\[tabpage\] .*/y$', trim(execute('verbose pwd')))
|
||||
call chdir('..')
|
||||
eval '..'->chdir()
|
||||
call assert_equal('Xdir', fnamemodify(getcwd(1, 2), ':t'))
|
||||
call assert_equal('Xdir', fnamemodify(getcwd(2, 2), ':t'))
|
||||
call assert_equal('z', fnamemodify(getcwd(3, 2), ':t'))
|
||||
|
@@ -22,7 +22,7 @@ func Test_move_cursor()
|
||||
call cursor(3, 0)
|
||||
call assert_equal([3, 1, 0, 1], getcurpos()[1:])
|
||||
" below last line goes to last line
|
||||
call cursor(9, 1)
|
||||
eval [9, 1]->cursor()
|
||||
call assert_equal([4, 1, 0, 1], getcurpos()[1:])
|
||||
" pass string arguments
|
||||
call cursor('3', '3')
|
||||
|
@@ -744,17 +744,13 @@ func Test_diff_hlID()
|
||||
|
||||
call diff_hlID(-1, 1)->synIDattr("name")->assert_equal("")
|
||||
|
||||
call assert_equal(diff_hlID(1, 1), hlID("DiffChange"))
|
||||
call diff_hlID(1, 1)->synIDattr("name")->assert_equal("DiffChange")
|
||||
call assert_equal(diff_hlID(1, 2), hlID("DiffText"))
|
||||
call diff_hlID(1, 2)->synIDattr("name")->assert_equal("DiffText")
|
||||
call diff_hlID(2, 1)->synIDattr("name")->assert_equal("")
|
||||
call assert_equal(diff_hlID(3, 1), hlID("DiffAdd"))
|
||||
call diff_hlID(3, 1)->synIDattr("name")->assert_equal("DiffAdd")
|
||||
call diff_hlID(4, 1)->synIDattr("name")->assert_equal("")
|
||||
eval 4->diff_hlID(1)->synIDattr("name")->assert_equal("")
|
||||
|
||||
wincmd w
|
||||
call assert_equal(diff_hlID(1, 1), hlID("DiffChange"))
|
||||
call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
|
||||
call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
|
||||
call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "")
|
||||
|
@@ -1713,7 +1713,7 @@ func Test_confirm()
|
||||
call assert_equal(1, a)
|
||||
|
||||
call feedkeys('y', 'L')
|
||||
let a = confirm('Are you sure?', "&Yes\n&No")
|
||||
let a = 'Are you sure?'->confirm("&Yes\n&No")
|
||||
call assert_equal(1, a)
|
||||
|
||||
call feedkeys('n', 'L')
|
||||
@@ -1727,7 +1727,7 @@ func Test_confirm()
|
||||
|
||||
" <Esc> requires another character to avoid it being seen as the start of an
|
||||
" escape sequence. Zero should be harmless.
|
||||
call feedkeys("\<Esc>0", 'L')
|
||||
eval "\<Esc>0"->feedkeys('L')
|
||||
let a = confirm('Are you sure?', "&Yes\n&No")
|
||||
call assert_equal(0, a)
|
||||
|
||||
@@ -1784,7 +1784,7 @@ func Test_readdir()
|
||||
let files = readdir('Xdir', {x -> len(add(l, x)) == 2 ? -1 : 1})
|
||||
call assert_equal(1, len(files))
|
||||
|
||||
call delete('Xdir', 'rf')
|
||||
eval 'Xdir'->delete('rf')
|
||||
endfunc
|
||||
|
||||
func Test_delete_rf()
|
||||
@@ -1827,6 +1827,7 @@ endfunc
|
||||
|
||||
func Test_char2nr()
|
||||
call assert_equal(12354, char2nr('あ', 1))
|
||||
call assert_equal(120, 'x'->char2nr())
|
||||
endfunc
|
||||
|
||||
func Test_charclass()
|
||||
|
Reference in New Issue
Block a user