diff options
| author | Kazuyuki Miyagi <yuzu3886@gmail.com> | 2022-06-17 18:30:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-17 18:30:03 +0100 |
| commit | 47f1a55849a73cefe738a246798221e45448546a (patch) | |
| tree | 5f3cd273b71e510e46ded724512a5cff1d1600fe | |
| parent | d592deb336523a5448779ee3d4bba80334cff1f7 (diff) | |
| download | vim-git-47f1a55849a73cefe738a246798221e45448546a.tar.gz | |
patch 8.2.5116: "limit" option of matchfuzzy() not always respectedv8.2.5116
Problem: "limit" option of matchfuzzy() not always respected.
Solution: Remove "else". (Kazuyuki Miyagi, closes #10586)
| -rw-r--r-- | runtime/doc/builtin.txt | 4 | ||||
| -rw-r--r-- | src/search.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_matchfuzzy.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 455fd9680..f0c1ddc1b 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -5899,6 +5899,8 @@ matchfuzzy({list}, {str} [, {dict}]) *matchfuzzy()* 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}]) *matchfuzzy()* 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 diff --git a/src/search.c b/src/search.c index e78e36b1e..c7309ee63 100644 --- a/src/search.c +++ b/src/search.c @@ -4844,7 +4844,8 @@ do_fuzzymatch(typval_T *argvars, typval_T *rettv, int retmatchpos) 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) { diff --git a/src/testdir/test_matchfuzzy.vim b/src/testdir/test_matchfuzzy.vim index b397392a7..02a74469e 100644 --- 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 diff --git a/src/version.c b/src/version.c index a7e622eab..c842e19dd 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5116, +/**/ 5115, /**/ 5114, |