patch 8.2.3237: when a builtin function gives an error processing continues

Problem:    When a builtin function gives an error processing continues.
Solution:   In Vim9 script return FAIL in get_func_tv().

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index a33038c9a1f27ff7a2fa75cabd85821967150639..03427c841db89ae4a800d784ecb0bfbf46392181 100644 (file)
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -2002,5 +2002,20 @@ def Test_inc_dec()
   CheckDefAndScriptFailure(lines, "E1202: No white space allowed after '++': ++ nr")
 enddef
 
+def Test_abort_after_error()
+  # should abort after strpart() fails, not give another type error
+  var lines =<< trim END
+      vim9script
+      var x: string
+      x = strpart(1, 2)
+  END
+  writefile(lines, 'Xtestscript')
+  var expected = 'E1174: String required for argument 1'
+  assert_fails('so Xtestscript', [expected, expected], 3)
+
+  delete('Xtestscript')
+enddef
+
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

diff --git a/src/userfunc.c b/src/userfunc.c
index e008718835c17b4a8331fb952aff0cd3905a5443..2adef7c18aaabde932df993a24c72e58cc7711e9 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1674,7 +1674,8 @@ get_func_tv(
 
     if (ret == OK)
     {
-       int             i = 0;
+       int     i = 0;
+       int     did_emsg_before = did_emsg;
 
        if (get_vim_var_nr(VV_TESTING))
        {
@@ -1689,6 +1690,10 @@ get_func_tv(
        }
 
        ret = call_func(name, len, rettv, argcount, argvars, funcexe);
+       if (in_vim9script() && did_emsg > did_emsg_before)
+           // An error in a builtin function does not return FAIL, but we do
+           // want to abort further processing if an error was given.
+           ret = FAIL;
 
        funcargs.ga_len -= i;
     }

diff --git a/src/version.c b/src/version.c
index ed3d516e1be65374d80c8d5350144676168dcd96..eb656652f5758a6f3a671c933d32e8b3f7c5cc4a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3237,
 /**/
     3236,
 /**/