Merge pull request #23102 from zeertzjq/vim-8.2.1378

vim-patch:8.2.{1378,3856,4361,4373,4476}

src/nvim/eval.c

@@ -3149,8 +3149,9 @@ static int eval7(char **arg, typval_T *rettv, evalarg_T *const evalarg, bool wan
       ret = FAIL;
     } else {
       const int flags = evalarg == NULL ? 0 : evalarg->eval_flags;
-      if (**arg == '(') {
+      if (*skipwhite(*arg) == '(') {
         // "name(..."  recursive!
+        *arg = skipwhite(*arg);
         ret = eval_func(arg, evalarg, s, len, rettv, flags, NULL);
       } else if (evaluate) {
         // get value of variable

test/old/testdir/test_functions.vim

@@ -2561,7 +2561,7 @@ func Test_builtin_check()
   call assert_fails('let l:.trim = {x -> " " .. x}', 'E704:')
   let lines =<< trim END
     vim9script
-    var s:trim = (x) => " " .. x
+    var trim = (x) => " " .. x
   END
   call CheckScriptFailure(lines, 'E704:')
 

test/old/testdir/test_ins_complete.vim

@@ -1598,11 +1598,11 @@ func Test_completefunc_callback()
     bw!
 
     # Test for using a script-local function name
-    def s:LocalCompleteFunc(findstart: number, base: string): any
+    def LocalCompleteFunc(findstart: number, base: string): any
       add(g:LocalCompleteFuncArgs, [findstart, base])
       return findstart ? 0 : []
     enddef
-    &completefunc = s:LocalCompleteFunc
+    &completefunc = LocalCompleteFunc
     new | only
     setline(1, 'three')
     g:LocalCompleteFuncArgs = []
@@ -1855,11 +1855,11 @@ func Test_omnifunc_callback()
     bw!
 
     # Test for using a script-local function name
-    def s:LocalOmniFunc(findstart: number, base: string): any
+    def LocalOmniFunc(findstart: number, base: string): any
       add(g:LocalOmniFuncArgs, [findstart, base])
       return findstart ? 0 : []
     enddef
-    &omnifunc = s:LocalOmniFunc
+    &omnifunc = LocalOmniFunc
     new | only
     setline(1, 'three')
     g:LocalOmniFuncArgs = []
@@ -2148,11 +2148,11 @@ func Test_thesaurusfunc_callback()
     bw!
 
     # Test for using a script-local function name
-    def s:LocalTsrFunc(findstart: number, base: string): any
+    def LocalTsrFunc(findstart: number, base: string): any
       add(g:LocalTsrFuncArgs, [findstart, base])
       return findstart ? 0 : []
     enddef
-    &thesaurusfunc = s:LocalTsrFunc
+    &thesaurusfunc = LocalTsrFunc
     new | only
     setline(1, 'three')
     g:LocalTsrFuncArgs = []

test/old/testdir/test_normal.vim

@@ -732,10 +732,10 @@ func Test_opfunc_callback()
     bw!
 
     # Test for using a script-local function name
-    def s:LocalOpFunc(type: string): void
+    def LocalOpFunc(type: string): void
       g:LocalOpFuncArgs = [type]
     enddef
-    &opfunc = s:LocalOpFunc
+    &opfunc = LocalOpFunc
     g:LocalOpFuncArgs = []
     normal! g@l
     assert_equal(['char'], g:LocalOpFuncArgs)

test/old/testdir/test_tagfunc.vim

@@ -369,11 +369,11 @@ func Test_tagfunc_callback()
     bw!
 
     # Test for using a script-local function name
-    def s:LocalTagFunc(pat: string, flags: string, info: dict<any> ): any
+    def LocalTagFunc(pat: string, flags: string, info: dict<any> ): any
       g:LocalTagFuncArgs = [pat, flags, info]
       return null
     enddef
-    &tagfunc = s:LocalTagFunc
+    &tagfunc = LocalTagFunc
     new
     g:LocalTagFuncArgs = []
     assert_fails('tag a12', 'E433:')

test/old/testdir/test_vimscript.vim

@@ -7267,7 +7267,7 @@ func Test_typed_script_var()
 endfunc
 
 " Test for issue6776              {{{1
-func Test_trinary_expression()
+func Test_ternary_expression()
   try
     call eval('0 ? 0')
   catch

test/old/testdir/vim9.vim

@@ -34,6 +34,14 @@ func CheckScriptSuccess(lines)
   endtry
 endfunc
 
+func CheckDefAndScriptSuccess(lines)
+  return
+endfunc
+
+func CheckDefAndScriptFailure(lines, error, lnum = -3)
+  return
+endfunc
+
 func CheckDefExecAndScriptFailure(lines, error, lnum = -3)
   return
 endfunc
@@ -85,6 +93,14 @@ func CheckTransLegacySuccess(lines)
   call CheckLegacySuccess(legacylines)
 endfunc
 
+func CheckTransDefSuccess(lines)
+  return
+endfunc
+
+func CheckTransVim9Success(lines)
+  return
+endfunc
+
 " Execute "lines" in a legacy function
 " Use 'VAR' for a declaration.
 " Use 'LET' for an assignment