# HG changeset patch # User Christian Brabandt # Date 1527007505 -7200 # Node ID ade79e3e3b8802598031bcf7798e75eff66dfbe7 # Parent 4a78b9913023c0fbaba91cfd5234a6ae5203620e patch 8.1.0019: error when defining a Lambda with index of a function result commit https://github.com/vim/vim/commit/b4518563c73460150344a57879bf5b22cb8b1c77 Author: Bram Moolenaar Date: Tue May 22 18:31:35 2018 +0200 patch 8.1.0019: error when defining a Lambda with index of a function result Problem: Error when defining a Lambda with index of a function result. Solution: When not evaluating an expression and skipping a function call, set the return value to VAR_UNKNOWN. diff --git a/src/testdir/test_lambda.vim b/src/testdir/test_lambda.vim --- a/src/testdir/test_lambda.vim +++ b/src/testdir/test_lambda.vim @@ -284,3 +284,9 @@ func Test_named_function_closure() call test_garbagecollect_now() call assert_equal(14, s:Abar()) endfunc + +func Test_lambda_with_index() + let List = {x -> [x]} + let Extract = {-> function(List, ['foobar'])()[0]} + call assert_equal('foobar', Extract()) +endfunc diff --git a/src/userfunc.c b/src/userfunc.c --- a/src/userfunc.c +++ b/src/userfunc.c @@ -1349,8 +1349,16 @@ call_func( } - /* execute the function if no errors detected and executing */ - if (evaluate && error == ERROR_NONE) + /* + * Execute the function if executing and no errors were detected. + */ + if (!evaluate) + { + // Not evaluating, which means the return value is unknown. This + // matters for giving error messages. + rettv->v_type = VAR_UNKNOWN; + } + else if (error == ERROR_NONE) { char_u *rfname = fname; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 19, +/**/ 18, /**/ 17,