diff options
| -rw-r--r-- | runtime/doc/eval.txt | 5 | ||||
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | test/functional/job/job_spec.lua | 17 |
3 files changed, 18 insertions, 6 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index c4d84c36c3..b303ad61b1 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -4019,8 +4019,9 @@ jobsend({job}, {data}) {Nvim} *jobsend()* {data} may be a string, string convertible, or a list. If {data} is a list, the items will be separated by newlines and - any newlines in an item will be sent as a NUL. For example: > - :call jobsend(j, ["abc", "123\n456"]) + any newlines in an item will be sent as a NUL. A final newline + can be sent by adding a final empty string. For example: > + :call jobsend(j, ["abc", "123\n456", ""]) < will send "abc<NL>123<NUL>456<NL>". jobstart({name}, {prog}[, {argv}]) {Nvim} *jobstart()* diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 45355bd7ac..87bd058c9e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10656,7 +10656,7 @@ static void f_jobsend(typval_T *argvars, typval_T *rettv) } ssize_t input_len; - char *input = (char *) save_tv_as_string(&argvars[1], &input_len, true); + char *input = (char *) save_tv_as_string(&argvars[1], &input_len, false); if (!input) { // Either the error has been handled by save_tv_as_string(), or there is no // input to send. diff --git a/test/functional/job/job_spec.lua b/test/functional/job/job_spec.lua index 9bdade7733..0d561ec4d7 100644 --- a/test/functional/job/job_spec.lua +++ b/test/functional/job/job_spec.lua @@ -45,7 +45,7 @@ describe('jobs', function() eq({'notification', 'stdout', {{'abc', ''}}}, next_message()) nvim('command', 'call jobsend(j, "123\\nxyz\\n")') eq({'notification', 'stdout', {{'123', 'xyz', ''}}}, next_message()) - nvim('command', 'call jobsend(j, [123, "xyz"])') + nvim('command', 'call jobsend(j, [123, "xyz", ""])') eq({'notification', 'stdout', {{'123', 'xyz', ''}}}, next_message()) nvim('command', "call jobstop(j)") eq({'notification', 'exit', {0}}, next_message()) @@ -67,7 +67,7 @@ describe('jobs', function() -- jobsend() preserves NULs. nvim('command', "let j = jobstart('xxx', 'cat', ['-'])") - nvim('command', [[call jobsend(j, ["123\n456"])]]) + nvim('command', [[call jobsend(j, ["123\n456",""])]]) eq({'notification', 'stdout', {{'123\n456', ''}}}, next_message()) nvim('command', "call jobstop(j)") end) @@ -92,13 +92,24 @@ describe('jobs', function() it('can preserve nuls', function() nvim('command', notify_str('v:job_data[1]', 'get(v:job_data, 2)')) nvim('command', "let j = jobstart('xxx', 'cat', ['-'])") - nvim('command', 'call jobsend(j, ["\n123\n", "abc\\nxyz\n"])') + nvim('command', 'call jobsend(j, ["\n123\n", "abc\\nxyz\n", ""])') eq({'notification', 'stdout', {{'\n123\n', 'abc\nxyz\n', ''}}}, next_message()) nvim('command', "call jobstop(j)") eq({'notification', 'exit', {0}}, next_message()) end) + it('can avoid sending final newline', function() + nvim('command', notify_str('v:job_data[1]', 'get(v:job_data, 2)')) + nvim('command', "let j = jobstart('xxx', 'cat', ['-'])") + nvim('command', 'call jobsend(j, ["some data", "without\nfinal nl"])') + eq({'notification', 'stdout', {{'some data', 'without\nfinal nl'}}}, + next_message()) + nvim('command', "call jobstop(j)") + eq({'notification', 'exit', {0}}, next_message()) + end) + + it('will not allow jobsend/stop on a non-existent job', function() eq(false, pcall(eval, "jobsend(-1, 'lol')")) eq(false, pcall(eval, "jobstop(-1)")) |