From 0bfa84916d110d4f4d863e91e144ff05ba431316 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 22 Jan 2022 12:27:04 +0000 Subject: [PATCH] patch 8.2.4178: Vim9: invalid error for return type of lambda when debugging Problem: Vim9: invalid error for return type of lambda when debugging. Solution: Do not check the return type of a lambda. (closes #9589) --- src/version.c | 2 ++ src/vim9cmds.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index 154b7e314..f273a155f 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4178, /**/ 4177, /**/ diff --git a/src/vim9cmds.c b/src/vim9cmds.c index 83ff6991b..27322df1c 100644 --- a/src/vim9cmds.c +++ b/src/vim9cmds.c @@ -2196,7 +2196,10 @@ compile_return(char_u *arg, int check_return_type, int legacy, cctx_T *cctx) if (*p != NUL && *p != '|' && *p != '\n') { - if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID) + // For a lambda, "return expr" is always used, also when "expr" results + // in a void. + if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID + && (cctx->ctx_ufunc->uf_flags & FC_LAMBDA) == 0) { emsg(_(e_returning_value_in_function_without_return_type)); return NULL; -- 2.40.0