# HG changeset patch # User Bram Moolenaar # Date 1597838404 -7200 # Node ID e27555ca1093966fa29398d783db07a7f1688b5f # Parent e32848bb87f2975729e8444dec27e980c18ab0ad patch 8.2.1485: Vim9: readdirex() expression doesn't accept bool Commit: https://github.com/vim/vim/commit/af8822ce085e3bd8edeb52cbb7306ddd42427d39 Author: Bram Moolenaar Date: Wed Aug 19 13:55:01 2020 +0200 patch 8.2.1485: Vim9: readdirex() expression doesn't accept bool Problem: Vim9: readdirex() expression doesn't accept bool. Solution: Accept both -1 and bool. (closes https://github.com/vim/vim/issues/6737) diff --git a/src/filepath.c b/src/filepath.c --- a/src/filepath.c +++ b/src/filepath.c @@ -1493,6 +1493,12 @@ readdirex_checkitem(void *context, void 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 --- 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 --- 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,