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)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 0d17b9ed79d28c697625758427496b60d052c8cf..65cb59f8d41fbaada08c2d42c89ae63a3a05fc5c 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -472,6 +472,13 @@ ret_dict_any(int argcount UNUSED, type_T **argtypes UNUSED)
     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 @@ static funcentry_T global_functions[] =
     {"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,

diff --git a/src/globals.h b/src/globals.h
index e4e73f21075b3b9ba12ca9acba454cc9cfdbf2a2..e601fd6c4572c1f6d028761628c1b608b45a2cf4 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -433,6 +433,7 @@ EXTERN type_T t_dict_empty INIT6(VAR_DICT, 0, 0, TTFLAG_STATIC, &t_unknown, NULL
 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);

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index c867266c2deb724e5029b46b1719e5c5b97d6fad..83b9931f24daf33c53fb4f5a2fcd04e92f96a18e 100644 (file)
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -314,6 +314,16 @@ def Test_extend_list_item_type()
   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

diff --git a/src/version.c b/src/version.c
index 47a5bccfd3117433ce8c8a2d5860fcc468e6e73c..1b63a5e9c7f7273919caa85b32c915d8eff22352 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2338,
 /**/
     2337,
 /**/