aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4243: Lua tests fail with Lua 5.4.4

Browse Source 
Problem:    Lua tests fail with Lua 5.4.4.
Solution:   Check messages like before Lua 5.4.3. (Jakub Kulík, closes #9652)
This commit is contained in:
=?UTF-8?q?Jakub=20Kul=C3=ADk?= 2022-01-28 17:20:03 +00:00 committed by Bram Moolenaar
parent fb55207ed1
commit 57ff2b7068
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/testdir/test_lua.vim
View File

@ -15,13 +15,11 @@ CheckFeature float
" Depending on the lua version, the error messages are different. " Depending on the lua version, the error messages are different.
let [s:major, s:minor, s:patch] = luaeval('vim.lua_version')->split('\.')->map({-> str2nr(v:val)}) let [s:major, s:minor, s:patch] = luaeval('vim.lua_version')->split('\.')->map({-> str2nr(v:val)})
let s:lua_53_or_later = 0 let s:lua_53_or_later = 0
let s:lua_543_or_later = 0 let s:lua_543 = 0
if (s:major == 5 && s:minor >= 3) || s:major > 5 if (s:major == 5 && s:minor >= 3) || s:major > 5
let s:lua_53_or_later = 1 let s:lua_53_or_later = 1
if (s:major == 5 if s:major == 5 && s:minor == 4 && s:patch == 3
\ && ((s:minor == 4 && s:patch >= 3) || s:minor > 4)) let s:lua_543 = 1
\ || s:major > 5
let s:lua_543_or_later = 1
endif endif
endif endif
@ -59,7 +57,7 @@ func Test_lua_luado()
" Error cases " Error cases
call assert_fails('luado string.format()', call assert_fails('luado string.format()',
\ "[string \"vim chunk\"]:1: bad argument #1 to 'format' (string expected, got no value)") \ "[string \"vim chunk\"]:1: bad argument #1 to 'format' (string expected, got no value)")
if s:lua_543_or_later if s:lua_543
let msg = "[string \"vim chunk\"]:1: global 'func' is not callable (a nil value)" let msg = "[string \"vim chunk\"]:1: global 'func' is not callable (a nil value)"
elseif s:lua_53_or_later elseif s:lua_53_or_later
let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (global 'func')" let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (global 'func')"
@ -151,7 +149,7 @@ func Test_lua_window()
" Window 3 does not exist so vim.window(3) should return nil " Window 3 does not exist so vim.window(3) should return nil
call assert_equal('nil', luaeval('tostring(vim.window(3))')) call assert_equal('nil', luaeval('tostring(vim.window(3))'))
if s:lua_543_or_later if s:lua_543
let msg = "[string \"luaeval\"]:1: field 'xyz' is not callable (a nil value)" let msg = "[string \"luaeval\"]:1: field 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later elseif s:lua_53_or_later
let msg = "[string \"luaeval\"]:1: attempt to call a nil value (field 'xyz')" let msg = "[string \"luaeval\"]:1: attempt to call a nil value (field 'xyz')"
@ -343,7 +341,7 @@ func Test_lua_buffer_insert()
call assert_equal('4', luaeval('vim.buffer()[4]')) call assert_equal('4', luaeval('vim.buffer()[4]'))
call assert_equal(v:null, luaeval('vim.buffer()[5]')) call assert_equal(v:null, luaeval('vim.buffer()[5]'))
call assert_equal(v:null, luaeval('vim.buffer()[{}]')) call assert_equal(v:null, luaeval('vim.buffer()[{}]'))
if s:lua_543_or_later if s:lua_543
let msg = "[string \"vim chunk\"]:1: method 'xyz' is not callable (a nil value)" let msg = "[string \"vim chunk\"]:1: method 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later elseif s:lua_53_or_later
let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (method 'xyz')" let msg = "[string \"vim chunk\"]:1: attempt to call a nil value (method 'xyz')"
@ -454,7 +452,7 @@ func Test_lua_list()
lua ll = vim.eval('l') lua ll = vim.eval('l')
let x = luaeval("ll[3]") let x = luaeval("ll[3]")
call assert_equal(v:null, x) call assert_equal(v:null, x)
if s:lua_543_or_later if s:lua_543
let msg = "[string \"luaeval\"]:1: method 'xyz' is not callable (a nil value)" let msg = "[string \"luaeval\"]:1: method 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later elseif s:lua_53_or_later
let msg = "[string \"luaeval\"]:1: attempt to call a nil value (method 'xyz')" let msg = "[string \"luaeval\"]:1: attempt to call a nil value (method 'xyz')"
@ -645,7 +643,7 @@ func Test_lua_blob()
call assert_equal(2, n) call assert_equal(2, n)
let n = luaeval('lb[6]') let n = luaeval('lb[6]')
call assert_equal(v:null, n) call assert_equal(v:null, n)
if s:lua_543_or_later if s:lua_543
let msg = "[string \"luaeval\"]:1: method 'xyz' is not callable (a nil value)" let msg = "[string \"luaeval\"]:1: method 'xyz' is not callable (a nil value)"
elseif s:lua_53_or_later elseif s:lua_53_or_later
let msg = "[string \"luaeval\"]:1: attempt to call a nil value (method 'xyz')" let msg = "[string \"luaeval\"]:1: attempt to call a nil value (method 'xyz')"

2
src/version.c
View File

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