1 files changed, 168 insertions, 7 deletions
diff --git a/test/functional/lua/vim_spec.lua b/test/functional/lua/vim_spec.lua
index e879f8b925..ca74d185cd 100644
--- a/test/functional/lua/vim_spec.lua
+++ b/test/functional/lua/vim_spec.lua
@@ -7,6 +7,7 @@ local meths = helpers.meths
 local command = helpers.command
 local clear = helpers.clear
 local eq = helpers.eq
+local ok = helpers.ok
 local eval = helpers.eval
 local feed = helpers.feed
 local pcall_err = helpers.pcall_err
@@ -310,18 +311,52 @@ describe('lua stdlib', function()
   end)
 
   it("vim.deepcopy", function()
-    local is_dc = exec_lua([[
+    ok(exec_lua([[
       local a = { x = { 1, 2 }, y = 5}
       local b = vim.deepcopy(a)
 
-      local count = 0
-      for _ in pairs(b) do count = count + 1 end
-
-      return b.x[1] == 1 and b.x[2] == 2 and b.y == 5 and count == 2
+      return b.x[1] == 1 and b.x[2] == 2 and b.y == 5 and vim.tbl_count(b) == 2
              and tostring(a) ~= tostring(b)
-    ]])
+    ]]))
+
+    ok(exec_lua([[
+      local a = {}
+      local b = vim.deepcopy(a)
+
+      return vim.tbl_islist(b) and vim.tbl_count(b) == 0 and tostring(a) ~= tostring(b)
+    ]]))
 
-    assert(is_dc)
+    ok(exec_lua([[
+      local a = vim.empty_dict()
+      local b = vim.deepcopy(a)
+
+      return not vim.tbl_islist(b) and vim.tbl_count(b) == 0
+    ]]))
+
+    ok(exec_lua([[
+      local a = {x = vim.empty_dict(), y = {}}
+      local b = vim.deepcopy(a)
+
+      return not vim.tbl_islist(b.x) and vim.tbl_islist(b.y)
+        and vim.tbl_count(b) == 2
+        and tostring(a) ~= tostring(b)
+    ]]))
+
+    ok(exec_lua([[
+      local f1 = function() return 1 end
+      local f2 = function() return 2 end
+      local t1 = {f = f1}
+      local t2 = vim.deepcopy(t1)
+      t1.f = f2
+      return t1.f() ~= t2.f()
+    ]]))
+
+    eq('Error executing lua: .../shared.lua: Cannot deepcopy object of type thread',
+      pcall_err(exec_lua, [[
+        local thread = coroutine.create(function () return 0 end)
+        local t = {thr = thread}
+        vim.deepcopy(t)
+      ]]))
   end)
 
   it('vim.pesc', function()
@@ -353,6 +388,30 @@ describe('lua stdlib', function()
     end
   end)
 
+  it('vim.tbl_map', function()
+    eq({}, exec_lua([[
+      return vim.tbl_map(function(v) return v * 2 end, {})
+    ]]))
+    eq({2, 4, 6}, exec_lua([[
+      return vim.tbl_map(function(v) return v * 2 end, {1, 2, 3})
+    ]]))
+    eq({{i=2}, {i=4}, {i=6}}, exec_lua([[
+      return vim.tbl_map(function(v) return { i = v.i * 2 } end, {{i=1}, {i=2}, {i=3}})
+    ]]))
+  end)
+
+  it('vim.tbl_filter', function()
+    eq({}, exec_lua([[
+      return vim.tbl_filter(function(v) return (v % 2) == 0 end, {})
+    ]]))
+    eq({2}, exec_lua([[
+      return vim.tbl_filter(function(v) return (v % 2) == 0 end, {1, 2, 3})
+    ]]))
+    eq({{i=2}}, exec_lua([[
+      return vim.tbl_filter(function(v) return (v.i % 2) == 0 end, {{i=1}, {i=2}, {i=3}})
+    ]]))
+  end)
+
   it('vim.tbl_islist', function()
     eq(true, exec_lua("return vim.tbl_islist({})"))
     eq(false, exec_lua("return vim.tbl_islist(vim.empty_dict())"))
@@ -369,6 +428,88 @@ describe('lua stdlib', function()
     eq(false, exec_lua("return vim.tbl_isempty({a=1, b=2, c=3})"))
   end)
 
+  it('vim.tbl_extend', function()
+    ok(exec_lua([[
+      local a = {x = 1}
+      local b = {y = 2}
+      local c = vim.tbl_extend("keep", a, b)
+
+      return c.x == 1 and b.y == 2 and vim.tbl_count(c) == 2
+    ]]))
+
+    ok(exec_lua([[
+      local a = {x = 1}
+      local b = {y = 2}
+      local c = {z = 3}
+      local d = vim.tbl_extend("keep", a, b, c)
+
+      return d.x == 1 and d.y == 2 and d.z == 3 and vim.tbl_count(d) == 3
+    ]]))
+
+    ok(exec_lua([[
+      local a = {x = 1}
+      local b = {x = 3}
+      local c = vim.tbl_extend("keep", a, b)
+
+      return c.x == 1 and vim.tbl_count(c) == 1
+    ]]))
+
+    ok(exec_lua([[
+      local a = {x = 1}
+      local b = {x = 3}
+      local c = vim.tbl_extend("force", a, b)
+
+      return c.x == 3 and vim.tbl_count(c) == 1
+    ]]))
+
+    ok(exec_lua([[
+      local a = vim.empty_dict()
+      local b = {}
+      local c = vim.tbl_extend("keep", a, b)
+
+      return not vim.tbl_islist(c) and vim.tbl_count(c) == 0
+    ]]))
+
+    ok(exec_lua([[
+      local a = {}
+      local b = vim.empty_dict()
+      local c = vim.tbl_extend("keep", a, b)
+
+      return vim.tbl_islist(c) and vim.tbl_count(c) == 0
+    ]]))
+
+    eq('Error executing lua: .../shared.lua: invalid "behavior": nil',
+      pcall_err(exec_lua, [[
+        return vim.tbl_extend()
+      ]])
+    )
+
+    eq('Error executing lua: .../shared.lua: wrong number of arguments (given 1, expected at least 3)',
+      pcall_err(exec_lua, [[
+        return vim.tbl_extend("keep")
+      ]])
+    )
+
+    eq('Error executing lua: .../shared.lua: wrong number of arguments (given 2, expected at least 3)',
+      pcall_err(exec_lua, [[
+        return vim.tbl_extend("keep", {})
+      ]])
+    )
+  end)
+
+  it('vim.tbl_count', function()
+    eq(0, exec_lua [[ return vim.tbl_count({}) ]])
+    eq(0, exec_lua [[ return vim.tbl_count(vim.empty_dict()) ]])
+    eq(0, exec_lua [[ return vim.tbl_count({nil}) ]])
+    eq(0, exec_lua [[ return vim.tbl_count({a=nil}) ]])
+    eq(1, exec_lua [[ return vim.tbl_count({1}) ]])
+    eq(2, exec_lua [[ return vim.tbl_count({1, 2}) ]])
+    eq(2, exec_lua [[ return vim.tbl_count({1, nil, 3}) ]])
+    eq(1, exec_lua [[ return vim.tbl_count({a=1}) ]])
+    eq(2, exec_lua [[ return vim.tbl_count({a=1, b=2}) ]])
+    eq(2, exec_lua [[ return vim.tbl_count({a=1, b=nil, c=3}) ]])
+  end)
+
   it('vim.deep_equal', function()
     eq(true, exec_lua [[ return vim.deep_equal({a=1}, {a=1}) ]])
     eq(true, exec_lua [[ return vim.deep_equal({a={b=1}}, {a={b=1}}) ]])
@@ -545,6 +686,8 @@ describe('lua stdlib', function()
     ]]))
 
     eq("{ {}, vim.empty_dict() }", exec_lua("return vim.inspect({{}, vim.empty_dict()})"))
+    eq('{}', exec_lua([[ return vim.fn.json_encode(vim.empty_dict()) ]]))
+    eq('{"a": {}, "b": []}', exec_lua([[ return vim.fn.json_encode({a=vim.empty_dict(), b={}}) ]]))
   end)
 
   it('vim.validate', function()
@@ -700,4 +843,22 @@ describe('lua stdlib', function()
     eq('2', funcs.luaeval "BUF")
     eq(2, funcs.luaeval "#vim.api.nvim_list_bufs()")
   end)
+
+  it('vim.regex', function()
+    exec_lua [[
+      re1 = vim.regex"ab\\+c"
+      vim.cmd "set nomagic ignorecase"
+      re2 = vim.regex"xYz"
+    ]]
+    eq({}, exec_lua[[return {re1:match_str("x ac")}]])
+    eq({3,7}, exec_lua[[return {re1:match_str("ac abbc")}]])
+
+    meths.buf_set_lines(0, 0, -1, true, {"yy", "abc abbc"})
+    eq({}, exec_lua[[return {re1:match_line(0, 0)}]])
+    eq({0,3}, exec_lua[[return {re1:match_line(0, 1)}]])
+    eq({3,7}, exec_lua[[return {re1:match_line(0, 1, 1)}]])
+    eq({3,7}, exec_lua[[return {re1:match_line(0, 1, 1, 8)}]])
+    eq({}, exec_lua[[return {re1:match_line(0, 1, 1, 7)}]])
+    eq({0,3}, exec_lua[[return {re1:match_line(0, 1, 0, 7)}]])
+  end)
 end)