Skip to content

Commit

Permalink
patch 9.1.0481: Vim9: term_getjob() throws an exception on error
Browse files Browse the repository at this point in the history
Problem:  Vim9: term_getjob() throws an exception on error
Solution: Return null_job instead, when there is no job
          (Ernie Rael)

closes: #14984

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
  • Loading branch information
errael authored and chrisbra committed Jun 13, 2024
1 parent 1c29602 commit a78eb25
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
5 changes: 3 additions & 2 deletions runtime/doc/terminal.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*terminal.txt* For Vim version 9.1. Last change: 2024 Jun 08
*terminal.txt* For Vim version 9.1. Last change: 2024 Jun 13


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -647,7 +647,8 @@ term_getcursor({buf}) *term_getcursor()*
term_getjob({buf}) *term_getjob()*
Get the Job associated with terminal window {buf}.
{buf} is used as with |term_getsize()|.
Returns |v:null| when there is no job.
Returns |v:null| when there is no job. In Vim9 script, return
null_job when there is no job.

Can also be used as a |method|: >
GetBufnr()->term_getjob()
Expand Down
12 changes: 10 additions & 2 deletions src/terminal.c
Original file line number Diff line number Diff line change
Expand Up @@ -6171,8 +6171,16 @@ f_term_getjob(typval_T *argvars, typval_T *rettv)
buf = term_get_buf(argvars, "term_getjob()");
if (buf == NULL)
{
rettv->v_type = VAR_SPECIAL;
rettv->vval.v_number = VVAL_NULL;
if (in_vim9script())
{
rettv->v_type = VAR_JOB;
rettv->vval.v_job = NULL;
}
else
{
rettv->v_type = VAR_SPECIAL;
rettv->vval.v_number = VVAL_NULL;
}
return;
}

Expand Down
1 change: 1 addition & 0 deletions src/testdir/test_vim9_builtin.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4557,6 +4557,7 @@ enddef
def Test_term_getjob()
CheckRunVimInTerminal
v9.CheckSourceDefAndScriptFailure(['term_getjob(0z10)'], ['E1013: Argument 1: type mismatch, expected string but got blob', 'E1220: String or Number required for argument 1'])
v9.CheckSourceDefAndScriptSuccess(['assert_true(term_getjob(0) == null_job)'])
enddef

def Test_term_getline()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
481,
/**/
480,
/**/
Expand Down

0 comments on commit a78eb25

Please sign in to comment.