Merge branch 'master' into colored-cmdline

3 files changed, 107 insertions, 5 deletions

diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index 5d543f914f..bec74f05fc 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -1948,8 +1948,8 @@ describe('typval.c', function()
           eq(OK, lib.tv_dict_add_str(d, 'testt', 3, 'TEST'))
           local dis = dict_items(d)
           alloc_log:check({
+            a.str(dis.tes.di_tv.vval.v_string, 'TEST'),
             a.di(dis.tes, 'tes'),
-            a.str(dis.tes.di_tv.vval.v_string, 'TEST')
           })
           eq({test=10, tes='TEST'}, dct2tbl(d))
           eq(FAIL, check_emsg(function() return lib.tv_dict_add_str(d, 'testt', 3, 'TEST') end,
@@ -1963,6 +1963,38 @@ describe('typval.c', function()
           alloc_log:check({})
         end)
       end)
+      describe('allocated_str()', function()
+        itp('works', function()
+          local d = dict({test=10})
+          eq({test=10}, dct2tbl(d))
+          alloc_log:clear()
+          local s1 = lib.xstrdup('TEST')
+          local s2 = lib.xstrdup('TEST')
+          local s3 = lib.xstrdup('TEST')
+          alloc_log:check({
+            a.str(s1, 'TEST'),
+            a.str(s2, 'TEST'),
+            a.str(s3, 'TEST'),
+          })
+          eq(OK, lib.tv_dict_add_allocated_str(d, 'testt', 3, s1))
+          local dis = dict_items(d)
+          alloc_log:check({
+            a.di(dis.tes, 'tes'),
+          })
+          eq({test=10, tes='TEST'}, dct2tbl(d))
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_allocated_str(d, 'testt', 3, s2) end,
+                              'E685: Internal error: hash_add()'))
+          alloc_log:clear()
+          lib.emsg_skip = lib.emsg_skip + 1
+          eq(FAIL, check_emsg(function() return lib.tv_dict_add_allocated_str(d, 'testt', 3, s3) end,
+                              nil))
+          lib.emsg_skip = lib.emsg_skip - 1
+          alloc_log:clear_tmp_allocs()
+          alloc_log:check({
+            a.freed(s3),
+          })
+        end)
+      end)
     end)
     describe('clear()', function()
       itp('works', function()
@@ -1975,7 +2007,7 @@ describe('typval.c', function()
         local dis = dict_items(d)
         local di = dis.TES
         local di_s = di.di_tv.vval.v_string
-        alloc_log:check({a.di(di), a.str(di_s)})
+        alloc_log:check({a.str(di_s), a.di(di)})
         eq({TES='tEsT'}, dct2tbl(d))
         lib.tv_dict_clear(d)
         alloc_log:check({a.freed(di_s), a.freed(di)})
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index cefd0315b7..c54d5a9b77 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -229,10 +229,10 @@ describe('env.c', function()
 
       local src = to_cstr("~"..curuser.."/Vcs/django-rest-framework/rest_framework/renderers.py")
       local dst = cstr(256, "~"..curuser)
-      cimp.expand_env_esc(src, dst, 1024, false, false, NULL)
+      cimp.expand_env_esc(src, dst, 256, false, false, NULL)
       local len = string.len(ffi.string(dst))
       assert.True(len > 56)
-      assert.True(len < 99)
+      assert.True(len < 256)
     end)
 
     itp('respects `dstlen` without expansion', function()
diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
index e3c8e616ce..d9c98e8afa 100644
--- a/test/unit/os/fileio_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -6,8 +6,10 @@ local itp = helpers.gen_itp(it)
 local eq = helpers.eq
 local ffi = helpers.ffi
 local cimport = helpers.cimport
+local cppimport = helpers.cppimport
 
-local m = cimport('./src/nvim/os/fileio.h')
+local m = cimport('./src/nvim/os/os.h', './src/nvim/os/fileio.h')
+cppimport('fcntl.h')
 
 local fcontents = ''
 for i = 0, 255 do
@@ -58,10 +60,26 @@ local function file_open_new(fname, flags, mode)
   return ret1[0], ret2
 end
 
+local function file_open_fd(fd, flags)
+  local ret2 = ffi.new('FileDescriptor')
+  local ret1 = m.file_open_fd(ret2, fd, flags)
+  return ret1, ret2
+end
+
+local function file_open_fd_new(fd, flags)
+  local ret1 = ffi.new('int[?]', 1, {0})
+  local ret2 = ffi.gc(m.file_open_fd_new(ret1, fd, flags), nil)
+  return ret1[0], ret2
+end
+
 local function file_write(fp, buf)
   return m.file_write(fp, buf, #buf)
 end
 
+local function msgpack_file_write(fp, buf)
+  return m.msgpack_file_write(fp, buf, #buf)
+end
+
 local function file_read(fp, size)
   local buf = nil
   if size == nil then
@@ -92,6 +110,46 @@ local function file_skip(fp, size)
   return m.file_skip(fp, size)
 end
 
+describe('file_open_fd', function()
+  itp('can use file descriptor returned by os_open for reading', function()
+    local fd = m.os_open(file1, m.kO_RDONLY, 0)
+    local err, fp = file_open_fd(fd, false)
+    eq(0, err)
+    eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
+    eq(0, m.file_close(fp, false))
+  end)
+  itp('can use file descriptor returned by os_open for writing', function()
+    eq(nil, lfs.attributes(filec))
+    local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
+    local err, fp = file_open_fd(fd, true)
+    eq(0, err)
+    eq(4, file_write(fp, 'test'))
+    eq(0, m.file_close(fp, false))
+    eq(4, lfs.attributes(filec).size)
+    eq('test', io.open(filec):read('*a'))
+  end)
+end)
+
+describe('file_open_fd_new', function()
+  itp('can use file descriptor returned by os_open for reading', function()
+    local fd = m.os_open(file1, m.kO_RDONLY, 0)
+    local err, fp = file_open_fd_new(fd, false)
+    eq(0, err)
+    eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
+    eq(0, m.file_free(fp, false))
+  end)
+  itp('can use file descriptor returned by os_open for writing', function()
+    eq(nil, lfs.attributes(filec))
+    local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
+    local err, fp = file_open_fd_new(fd, true)
+    eq(0, err)
+    eq(4, file_write(fp, 'test'))
+    eq(0, m.file_free(fp, false))
+    eq(4, lfs.attributes(filec).size)
+    eq('test', io.open(filec):read('*a'))
+  end)
+end)
+
 describe('file_open', function()
   itp('can create a rwx------ file with kFileCreate', function()
     local err, fp = file_open(filec, m.kFileCreate, 448)
@@ -393,6 +451,18 @@ describe('file_write', function()
   end)
 end)
 
+describe('msgpack_file_write', function()
+  itp('can write the whole file at once', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    local wr = msgpack_file_write(fp, fcontents)
+    eq(0, wr)
+    eq(0, m.file_close(fp, false))
+    eq(fcontents, io.open(filec):read('*a'))
+  end)
+end)
+
 describe('file_skip', function()
   itp('can skip 3 bytes', function()
     local err, fp = file_open(file1, 0, 384)