Mercurial > vim
changeset 29194:f92f658585e6 v8.2.5116
patch 8.2.5116: "limit" option of matchfuzzy() not always respected
Commit: https://github.com/vim/vim/commit/47f1a55849a73cefe738a246798221e45448546a
Author: Kazuyuki Miyagi <yuzu3886@gmail.com>
Date: Fri Jun 17 18:30:03 2022 +0100
patch 8.2.5116: "limit" option of matchfuzzy() not always respected
Problem: "limit" option of matchfuzzy() not always respected.
Solution: Remove "else". (Kazuyuki Miyagi, closes https://github.com/vim/vim/issues/10586)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 17 Jun 2022 19:45:02 +0200 |
| parents | 1e9e9d89f0ee |
| children | ee8ebed77cee |
| files | runtime/doc/builtin.txt src/search.c src/testdir/test_matchfuzzy.vim src/version.c |
| diffstat | 4 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -5899,6 +5899,8 @@ matchfuzzy({list}, {str} [, {dict}]) * matchseq When this item is present return only matches that contain the characters in {str} in the given sequence. + limit Maximum number of matches in {list} to be + returned. Zero means no limit. If {list} is a list of dictionaries, then the optional {dict} argument supports the following additional items: @@ -5910,8 +5912,6 @@ matchfuzzy({list}, {str} [, {dict}]) * This should accept a dictionary item as the argument and return the text for that item to use for fuzzy matching. - limit Maximum number of matches in {list} to be - returned. Zero means no limit. {str} is treated as a literal string and regular expression matching is NOT supported. The maximum supported {str} length
--- a/src/search.c +++ b/src/search.c @@ -4844,7 +4844,8 @@ do_fuzzymatch(typval_T *argvars, typval_ return; } } - else if ((di = dict_find(d, (char_u *)"limit", -1)) != NULL) + + if ((di = dict_find(d, (char_u *)"limit", -1)) != NULL) { if (di->di_tv.v_type != VAR_NUMBER) {
--- a/src/testdir/test_matchfuzzy.vim +++ b/src/testdir/test_matchfuzzy.vim @@ -243,6 +243,14 @@ func Test_matchfuzzy_limit() call assert_equal(['2', '2'], x->matchfuzzy('2', #{limit: 2})) call assert_equal(['2', '2'], x->matchfuzzy('2', #{limit: 3})) call assert_fails("call matchfuzzy(x, '2', #{limit: '2'})", 'E475:') + + let l = [{'id': 5, 'val': 'crayon'}, {'id': 6, 'val': 'camera'}] + call assert_equal([{'id': 5, 'val': 'crayon'}, {'id': 6, 'val': 'camera'}], l->matchfuzzy('c', #{text_cb: {v -> v.val}})) + call assert_equal([{'id': 5, 'val': 'crayon'}, {'id': 6, 'val': 'camera'}], l->matchfuzzy('c', #{key: 'val'})) + call assert_equal([{'id': 5, 'val': 'crayon'}, {'id': 6, 'val': 'camera'}], l->matchfuzzy('c', #{text_cb: {v -> v.val}, limit: 0})) + call assert_equal([{'id': 5, 'val': 'crayon'}, {'id': 6, 'val': 'camera'}], l->matchfuzzy('c', #{key: 'val', limit: 0})) + call assert_equal([{'id': 5, 'val': 'crayon'}], l->matchfuzzy('c', #{text_cb: {v -> v.val}, limit: 1})) + call assert_equal([{'id': 5, 'val': 'crayon'}], l->matchfuzzy('c', #{key: 'val', limit: 1})) endfunc " vim: shiftwidth=2 sts=2 expandtab