patch 8.2.2018: Vim9: script variable not found from lambda
Problem: Vim9: script variable not found from lambda.
Solution: In a lambda also check the script hashtab for a variable without a
scope. (closes #7329)
diff --git a/src/evalvars.c b/src/evalvars.c
index 9c05c57..75893bb 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2628,7 +2628,28 @@
return ret;
// Search in parent scope for lambda
- return find_var_in_scoped_ht(name, no_autoload || htp != NULL);
+ ret = find_var_in_scoped_ht(name, no_autoload || htp != NULL);
+ if (ret != NULL)
+ return ret;
+
+ // in Vim9 script items without a scope can be script-local
+ if (in_vim9script() && name[0] != NUL && name[1] != ':')
+ {
+ ht = get_script_local_ht();
+ if (ht != NULL)
+ {
+ ret = find_var_in_ht(ht, *name, varname,
+ no_autoload || htp != NULL);
+ if (ret != NULL)
+ {
+ if (htp != NULL)
+ *htp = ht;
+ return ret;
+ }
+ }
+ }
+
+ return NULL;
}
/*