patch 8.1.0672: the Lua interface doesn't know about v:null

Problem:    The Lua interface doesn't know about v:null.
Solution:   Add Lua support for v:null. (Uji, closes #3744)

diff --git a/src/if_lua.c b/src/if_lua.c
index 6e33734643106d880e917669429645101b0e0efd..9400e3a35f1ba8725fe4886e23ce1636f6575567 100644 (file)
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -562,6 +562,10 @@ luaV_totypval(lua_State *L, int pos, typval_T *tv)
            tv->v_type = VAR_SPECIAL;
            tv->vval.v_number = (varnumber_T) lua_toboolean(L, pos);
            break;
+       case LUA_TNIL:
+           tv->v_type = VAR_SPECIAL;
+           tv->vval.v_number = VVAL_NULL;
+           break;
        case LUA_TSTRING:
            tv->v_type = VAR_STRING;
            tv->vval.v_string = vim_strsave((char_u *) lua_tostring(L, pos));

diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index e021a2f447126955a20eb2c64be8a8a7dadb98e0..1a5c74f7805b8e4ef68b49e51363202cff4d7040 100644 (file)
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -298,17 +298,18 @@ func Test_list()
   lua l:add('abc')
   lua l:add(true)
   lua l:add(false)
+  lua l:add(nil)
   lua l:add(vim.eval("[1, 2, 3]"))
   lua l:add(vim.eval("{'a':1, 'b':2, 'c':3}"))
-  call assert_equal([123.0, 'abc', v:true, v:false, [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}], l)
-  call assert_equal(6.0, luaeval('#l'))
+  call assert_equal([123.0, 'abc', v:true, v:false, v:null, [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}], l)
+  call assert_equal(7.0, luaeval('#l'))
   call assert_match('^list: \%(0x\)\?\x\+$', luaeval('tostring(l)'))
 
   lua l[0] = 124
-  lua l[4] = nil
+  lua l[5] = nil
   lua l:insert('first')
   lua l:insert('xx', 3)
-  call assert_equal(['first', 124.0, 'abc', 'xx', v:true, v:false, {'a': 1, 'b': 2, 'c': 3}], l)
+  call assert_equal(['first', 124.0, 'abc', 'xx', v:true, v:false, v:null, {'a': 1, 'b': 2, 'c': 3}], l)
 
   lockvar 1 l
   call assert_fails('lua l:add("x")', '[string "vim chunk"]:1: list is locked')

diff --git a/src/version.c b/src/version.c
index 3de44618f907fa8f6b48409bd06d0430dd21b0b0..623d2a0ef55ad0e180fdff689715c32174d12243 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    672,
 /**/
     671,
 /**/