changeset 28047:b10fa9b17c85 v8.2.4548

patch 8.2.4548: script-local function is deleted when used in a funcref Commit: https://github.com/vim/vim/commit/fb43cfc2c6a003b850343bfd27cb3059c734d7d4 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 11 18:54:17 2022 +0000 patch 8.2.4548: script-local function is deleted when used in a funcref Problem: Script-local function is deleted when used in a funcref. Solution: Do not consider a function starting with "<SNR>" reference counted. (closes #9916, closes #9820)
author Bram Moolenaar <Bram@vim.org>
date Fri, 11 Mar 2022 20:00:03 +0100
parents e0b5ccdea95f
children bf4df32ceb1e
files src/testdir/test_vim9_func.vim src/userfunc.c src/version.c
diffstat 3 files changed, 24 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -3717,6 +3717,24 @@ def Test_nested_closure_in_dict()
   v9.CheckScriptSuccess(lines)
 enddef
 
+def Test_script_local_other_script()
+  var lines =<< trim END
+      function LegacyJob()
+        let FuncRef = function('s:close_cb')
+      endfunction
+      function s:close_cb(...)
+      endfunction
+  END
+  lines->writefile('Xlegacy.vim')
+  source Xlegacy.vim
+  g:LegacyJob()
+  g:LegacyJob()
+  g:LegacyJob()
+
+  delfunc g:LegacyJob
+  delete('Xlegacy.vim')
+enddef
+
 def Test_check_func_arg_types()
   var lines =<< trim END
       vim9script
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2215,8 +2215,9 @@ numbered_function(char_u *name)
 
 /*
  * There are two kinds of function names:
- * 1. ordinary names, function defined with :function or :def
- * 2. numbered functions and lambdas
+ * 1. ordinary names, function defined with :function or :def;
+ *    can start with "<SNR>123_" literally or with K_SPECIAL.
+ * 2. Numbered functions and lambdas: "<lambda>123"
  * For the first we only count the name stored in func_hashtab as a reference,
  * using function() does not count as a reference, because the function is
  * looked up by name.
@@ -2224,7 +2225,7 @@ numbered_function(char_u *name)
     int
 func_name_refcount(char_u *name)
 {
-    return numbered_function(name) || *name == '<';
+    return numbered_function(name) || (name[0] == '<' && name[1] == 'l');
 }
 
 /*
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4548,
+/**/
     4547,
 /**/
     4546,