diff options
| -rw-r--r-- | src/nvim/eval.c | 11 | ||||
| -rw-r--r-- | src/nvim/testdir/test_writefile.vim | 21 | ||||
| -rw-r--r-- | test/functional/eval/writefile_spec.lua | 21 |
3 files changed, 36 insertions, 17 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 86ed9052aa..8d45863d6f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -17675,7 +17675,7 @@ static void f_wordcount(typval_T *argvars, typval_T *rettv, FunPtr fptr) /// "writefile()" function static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr) { - rettv->vval.v_number = 0; // Assuming success. + rettv->vval.v_number = -1; if (check_restricted() || check_secure()) { return; @@ -17685,6 +17685,12 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr) EMSG2(_(e_listarg), "writefile()"); return; } + const list_T *const list = argvars[0].vval.v_list; + TV_LIST_ITER_CONST(list, li, { + if (!tv_check_str_or_nr(TV_LIST_ITEM_TV(li))) { + return; + } + }); bool binary = false; bool append = false; @@ -17716,7 +17722,6 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr) } FileDescriptor fp; int error; - rettv->vval.v_number = -1; if (*fname == NUL) { EMSG(_("E482: Can't open file with an empty name")); } else if ((error = file_open(&fp, fname, @@ -17725,7 +17730,7 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr) emsgf(_("E482: Can't open file %s for writing: %s"), fname, os_strerror(error)); } else { - if (write_list(&fp, argvars[0].vval.v_list, binary)) { + if (write_list(&fp, list, binary)) { rettv->vval.v_number = 0; } if ((error = file_close(&fp, do_fsync)) != 0) { diff --git a/src/nvim/testdir/test_writefile.vim b/src/nvim/testdir/test_writefile.vim index d820c580ac..8b031646b5 100644 --- a/src/nvim/testdir/test_writefile.vim +++ b/src/nvim/testdir/test_writefile.vim @@ -1,5 +1,6 @@ +" Tests for the writefile() function. -function! Test_WriteFile() +func Test_writefile() let f = tempname() call writefile(["over","written"], f, "b") call writefile(["hello","world"], f, "b") @@ -13,4 +14,20 @@ function! Test_WriteFile() call assert_equal("morning", l[3]) call assert_equal("vimmers", l[4]) call delete(f) -endfunction +endfunc + +func Test_writefile_fails_gently() + call assert_fails('call writefile(["test"], "Xfile", [])', 'E730:') + call assert_false(filereadable("Xfile")) + call delete("Xfile") + + call assert_fails('call writefile(["test", [], [], [], "tset"], "Xfile")', 'E745:') + call assert_false(filereadable("Xfile")) + call delete("Xfile") + + call assert_fails('call writefile([], "Xfile", [])', 'E730:') + call assert_false(filereadable("Xfile")) + call delete("Xfile") + + call assert_fails('call writefile([], [])', 'E730:') +endfunc diff --git a/test/functional/eval/writefile_spec.lua b/test/functional/eval/writefile_spec.lua index 2f84114b9b..0bb7523d7e 100644 --- a/test/functional/eval/writefile_spec.lua +++ b/test/functional/eval/writefile_spec.lua @@ -127,23 +127,20 @@ describe('writefile()', function() eq('TEST', read_file(fname)) end) - it('stops writing to file after error in list', function() + it('does not write to file if error in list', function() local args = '["tset"] + repeat([%s], 3), "' .. fname .. '"' - eq('\nE806: using Float as a String', + eq('\nE805: Expected a Number or a String, Float found', redir_exec(('call writefile(%s)'):format(args:format('0.0')))) - eq('tset\n', read_file(fname)) + eq(nil, read_file(fname)) write_file(fname, 'TEST') - eq('\nE730: using List as a String', + eq('\nE745: Expected a Number or a String, List found', redir_exec(('call writefile(%s)'):format(args:format('[]')))) - eq('tset\n', read_file(fname)) - write_file(fname, 'TEST') - eq('\nE731: using Dictionary as a String', + eq('TEST', read_file(fname)) + eq('\nE728: Expected a Number or a String, Dictionary found', redir_exec(('call writefile(%s)'):format(args:format('{}')))) - eq('tset\n', read_file(fname)) - write_file(fname, 'TEST') - eq('\nE729: using Funcref as a String', + eq('TEST', read_file(fname)) + eq('\nE703: Expected a Number or a String, Funcref found', redir_exec(('call writefile(%s)'):format(args:format('function("tr")')))) - eq('tset\n', read_file(fname)) - write_file(fname, 'TEST') + eq('TEST', read_file(fname)) end) end) |