summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-19 13:55:01 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-19 13:55:01 +0200
commitaf8822ce085e3bd8edeb52cbb7306ddd42427d39 (patch)
tree30b4371262468b74e34bdc02d8f1be430f7432c4
parent9b02d64cff7664b9643205d6e23b08da688fe87a (diff)
patch 8.2.1485: Vim9: readdirex() expression doesn't accept boolv8.2.1485
Problem: Vim9: readdirex() expression doesn't accept bool. Solution: Accept both -1 and bool. (closes #6737)
-rw-r--r--src/filepath.c6
-rw-r--r--src/testdir/test_vim9_func.vim4
-rw-r--r--src/version.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/src/filepath.c b/src/filepath.c
index a1e281b0ee..d4592eba31 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -1493,6 +1493,12 @@ readdirex_checkitem(void *context, void *item)
if (eval_expr_typval(expr, argv, 1, &rettv) == FAIL)
goto theend;
+ // We want to use -1, but also true/false should be allowed.
+ if (rettv.v_type == VAR_SPECIAL || rettv.v_type == VAR_BOOL)
+ {
+ rettv.v_type = VAR_NUMBER;
+ rettv.vval.v_number = rettv.vval.v_number == VVAL_TRUE;
+ }
retval = tv_get_number_chk(&rettv, &error);
if (error)
retval = -1;
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 79fd80ae18..751cd6d602 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1386,6 +1386,10 @@ def Test_search()
assert_equal(2, search('bar', 'W', 0, 0, {-> val == 1}))
enddef
+def Test_readdirex()
+ eval expand('.')->readdirex({e -> e.name[0] !=# '.'})
+enddef
+
def Fibonacci(n: number): number
if n < 2
return n
diff --git a/src/version.c b/src/version.c
index 80f464a36d..3c1eb1cf5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1485,
+/**/
1484,
/**/
1483,