diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-06-18 13:43:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-18 13:43:02 +0800 |
| commit | 966d55effe5cbfc3d779c89591a1bec4e9ac6639 (patch) | |
| tree | c210dc14c8fcbd578ed543b83ec4a1b3e9e739e9 | |
| parent | e651ae5864503d219134c7c0124bff6bd9a663f7 (diff) | |
| download | rneovim-966d55effe5cbfc3d779c89591a1bec4e9ac6639.tar.gz rneovim-966d55effe5cbfc3d779c89591a1bec4e9ac6639.tar.bz2 rneovim-966d55effe5cbfc3d779c89591a1bec4e9ac6639.zip | |
vim-patch:8.2.5116: "limit" option of matchfuzzy() not always respected (#19005)
Problem: "limit" option of matchfuzzy() not always respected.
Solution: Remove "else". (Kazuyuki Miyagi, closes vim/vim#10586)
https://github.com/vim/vim/commit/47f1a55849a73cefe738a246798221e45448546a
| -rw-r--r-- | runtime/doc/builtin.txt | 4 | ||||
| -rw-r--r-- | src/nvim/search.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_matchfuzzy.vim | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 43c1f80fd6..54eac87070 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -5034,6 +5034,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: @@ -5045,8 +5047,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/nvim/search.c b/src/nvim/search.c index 4243dce479..d442a5aa87 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -5239,7 +5239,9 @@ static void do_fuzzymatch(const typval_T *const argvars, typval_T *const rettv, } else if (!tv_dict_get_callback(d, "text_cb", -1, &cb)) { semsg(_(e_invargval), "text_cb"); return; - } else if ((di = tv_dict_find(d, "limit", -1)) != NULL) { + } + + if ((di = tv_dict_find(d, "limit", -1)) != NULL) { if (di->di_tv.v_type != VAR_NUMBER) { semsg(_(e_invarg2), tv_get_string(&di->di_tv)); return; diff --git a/src/nvim/testdir/test_matchfuzzy.vim b/src/nvim/testdir/test_matchfuzzy.vim index 533aec8d9a..6b4949ad8c 100644 --- a/src/nvim/testdir/test_matchfuzzy.vim +++ b/src/nvim/testdir/test_matchfuzzy.vim @@ -258,6 +258,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 |