From 486fc25a295464d107264b63997bdbe3745e3c71 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 18 Jan 2023 14:51:07 +0000 Subject: patch 9.0.1217: using an object member in a closure doesn't work Problem: Using an object member in a closure doesn't work. Solution: Initialize lv_loop_depth. (closes #11840) --- src/testdir/test_vim9_class.vim | 18 ++++++++++++++++++ src/version.c | 2 ++ src/vim9compile.c | 1 + 3 files changed, 21 insertions(+) diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim index dadd3e4df5..03798268a2 100644 --- a/src/testdir/test_vim9_class.vim +++ b/src/testdir/test_vim9_class.vim @@ -1214,5 +1214,23 @@ def Test_abstract_class() v9.CheckScriptFailure(lines, 'E1316:') enddef +def Test_closure_in_class() + var lines =<< trim END + vim9script + + class Foo + this.y: list = ['B'] + + def new() + g:result = filter(['A', 'B'], (_, v) => index(this.y, v) == -1) + enddef + endclass + + Foo.new() + assert_equal(['A'], g:result) + END + v9.CheckScriptSuccess(lines) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index d63abc3490..4c7d8962cb 100644 --- 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 */ +/**/ + 1217, /**/ 1216, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index c89c37aabf..3a55186de0 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -66,6 +66,7 @@ lookup_local(char_u *name, size_t len, lvar_T *lvar, cctx_T *cctx) if (lvar != NULL) { CLEAR_POINTER(lvar); + lvar->lv_loop_depth = -1; lvar->lv_name = (char_u *)(is_super ? "super" : "this"); if (cctx->ctx_ufunc->uf_class != NULL) { -- cgit v1.2.3