patch 9.0.0836: wrong error when using extend() with funcref

Problem:    Wrong error when using extend() with funcref.
Solution:   Better check the variable type. (closes #11468, closes #11455)

diff --git a/src/dict.c b/src/dict.c
index 82c31de51545f08720e95cd20b1638ec607fb583..c2f0fcc4d9b8f30ad1302cc67b748f152fdef44a 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -352,7 +352,7 @@ dict_copy(dict_T *orig, int deep, int top, int copyID)
 }
 
 /*
- * Check for adding a function to g: or s:.
+ * Check for adding a function to g: or s: (in Vim9 script) or l:.
  * If the name is wrong give an error message and return TRUE.
  */
     int
@@ -1105,17 +1105,9 @@ dict_extend(dict_T *d1, dict_T *d2, char_u *action, char *func_name)
        {
            --todo;
            di1 = dict_find(d1, hi2->hi_key, -1);
-           if (d1->dv_scope != 0)
-           {
-               // Disallow replacing a builtin function in l: and g:.
-               // Check the key to be valid when adding to any scope.
-               if (d1->dv_scope == VAR_DEF_SCOPE
-                       && HI2DI(hi2)->di_tv.v_type == VAR_FUNC
-                       && var_wrong_func_name(hi2->hi_key, di1 == NULL))
-                   break;
-               if (!valid_varname(hi2->hi_key, -1, TRUE))
-                   break;
-           }
+           // Check the key to be valid when adding to any scope.
+           if (d1->dv_scope != 0 && !valid_varname(hi2->hi_key, -1, TRUE))
+               break;
 
            if (type != NULL
                     && check_typval_arg_type(type, &HI2DI(hi2)->di_tv,
@@ -1138,6 +1130,7 @@ dict_extend(dict_T *d1, dict_T *d2, char_u *action, char *func_name)
                if (value_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
                        || var_check_ro(di1->di_flags, arg_errmsg, TRUE))
                    break;
+               // Disallow replacing a builtin function.
                if (dict_wrong_func_name(d1, &HI2DI(hi2)->di_tv, hi2->hi_key))
                    break;
                clear_tv(&di1->di_tv);

diff --git a/src/eval.c b/src/eval.c
index b815113e414b165ca3fe482ae8c8ed1978691330..c57f6a4a05b9b0a2f001f285317fba88e85dfb7d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1376,7 +1376,8 @@ get_lval(
                else
                    prevval = 0; // avoid compiler warning
                wrong = (lp->ll_dict->dv_scope == VAR_DEF_SCOPE
-                              && rettv->v_type == VAR_FUNC
+                              && (rettv->v_type == VAR_FUNC
+                                           || rettv->v_type == VAR_PARTIAL)
                               && var_wrong_func_name(key, lp->ll_di == NULL))
                        || !valid_varname(key, -1, TRUE);
                if (len != -1)

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 938a839bfdeb8b25ce5a3aaec3667d2af12f2fef..831a8946f6699b9ee44cbd88a895a65b27e91b68 100644 (file)
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2938,6 +2938,25 @@ func Test_builtin_check()
   let g:bar = 123
   call extend(g:, #{bar: { -> "foo" }}, "keep")
   call assert_fails('call extend(g:, #{bar: { -> "foo" }}, "force")', 'E704:')
+  unlet g:bar
+
+  call assert_fails('call extend(l:, #{foo: { -> "foo" }})', 'E704:')
+  let bar = 123
+  call extend(l:, #{bar: { -> "foo" }}, "keep")
+  call assert_fails('call extend(l:, #{bar: { -> "foo" }}, "force")', 'E704:')
+  unlet bar
+
+  call assert_fails('call extend(g:, #{foo: function("extend")})', 'E704:')
+  let g:bar = 123
+  call extend(g:, #{bar: function("extend")}, "keep")
+  call assert_fails('call extend(g:, #{bar: function("extend")}, "force")', 'E704:')
+  unlet g:bar
+
+  call assert_fails('call extend(l:, #{foo: function("extend")})', 'E704:')
+  let bar = 123
+  call extend(l:, #{bar: function("extend")}, "keep")
+  call assert_fails('call extend(l:, #{bar: function("extend")}, "force")', 'E704:')
+  unlet bar
 endfunc
 
 func Test_funcref_to_string()

diff --git a/src/testdir/test_let.vim b/src/testdir/test_let.vim
index 3f9bdd4db1ad12116831f20efcb855f2bb7a21be..4e4a386df91970a40a42eb34c8386ba3113323c1 100644 (file)
--- a/src/testdir/test_let.vim
+++ b/src/testdir/test_let.vim
@@ -316,6 +316,7 @@ func Test_let_errors()
   call assert_fails('let l += 2', 'E734:')
   call assert_fails('let g:["a;b"] = 10', 'E461:')
   call assert_fails('let g:.min = function("max")', 'E704:')
+  call assert_fails('let g:cos = "" | let g:.cos = {-> 42}', 'E704:')
   if has('channel')
     let ch = test_null_channel()
     call assert_fails('let ch += 1', 'E734:')

diff --git a/src/version.c b/src/version.c
index 755cd09d5d2b4875779c7eb91c27035694cefa5d..2694639507aa5325c1ec8eb495020718f8f51943 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    836,
 /**/
     835,
 /**/