commit 64ed4d4398e92ac56a9bbd66d5ec992dd4c335f7
author Bram Moolenaar <Bram@vim.org> Tue Jan 12 21:22:31 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Jan 12 21:22:31 2021 +0100
tree 4c44133ad50b219b2b2cf34d82eb7f787717dd7c
parent 67876de7bbc4254268d8180d68203b965e25ed95

patch 8.2.2338: Vim9: no error if using job_info() result wrongly

Problem:    Vim9: no error if using job_info() result wrongly.
Solution:   Adjust return type on number of arguments. (closes #7667)

src/evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 0d17b9e..65cb59f 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -472,6 +472,13 @@
     return &t_dict_any;
 }
     static type_T *
+ret_job_info(int argcount, type_T **argtypes UNUSED)
+{
+    if (argcount == 0)
+	return &t_list_job;
+    return &t_dict_any;
+}
+    static type_T *
 ret_dict_number(int argcount UNUSED, type_T **argtypes UNUSED)
 {
     return &t_dict_number;
@@ -1100,7 +1107,7 @@
     {"job_getchannel",	1, 1, FEARG_1,	    NULL,
 			ret_channel,	    JOB_FUNC(f_job_getchannel)},
     {"job_info",	0, 1, FEARG_1,	    NULL,
-			ret_dict_any,	    JOB_FUNC(f_job_info)},
+			ret_job_info,	    JOB_FUNC(f_job_info)},
     {"job_setoptions",	2, 2, FEARG_1,	    NULL,
 			ret_void,	    JOB_FUNC(f_job_setoptions)},
     {"job_start",	1, 2, FEARG_1,	    NULL,

src/globals.h

diff --git a/src/globals.h b/src/globals.h
index e4e73f2..e601fd6 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -433,6 +433,7 @@
 EXTERN type_T t_list_bool INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_bool, NULL);
 EXTERN type_T t_list_number INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_number, NULL);
 EXTERN type_T t_list_string INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_string, NULL);
+EXTERN type_T t_list_job INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_job, NULL);
 EXTERN type_T t_list_dict_any INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_dict_any, NULL);
 
 EXTERN type_T t_dict_bool INIT6(VAR_DICT, 0, 0, TTFLAG_STATIC, &t_bool, NULL);

src/testdir/test_vim9_builtin.vim

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index c867266..83b9931 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -314,6 +314,16 @@
   CheckScriptFailure(['vim9script'] + lines, 'E1012:', 1)
 enddef
 
+def Test_job_info_return_type()
+  if has('job')
+    job_start(&shell)
+    var jobs = job_info()
+    assert_equal(v:t_list, type(jobs))
+    assert_equal(v:t_dict, type(job_info(jobs[0])))
+    job_stop(jobs[0])
+  endif
+enddef
+
 def Wrong_dict_key_type(items: list<number>): list<number>
   return filter(items, (_, val) => get({[val]: 1}, 'x'))
 enddef

src/version.c

diff --git a/src/version.c b/src/version.c
index 47a5bcc..1b63a5e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2338,
+/**/
     2337,
 /**/
     2336,