Mercurial > vim
changeset 28831:b5c46d447518 v8.2.4939
patch 8.2.4939: matchfuzzypos() with "matchseq" does not have all positions
Commit: https://github.com/vim/vim/commit/9af2bc075169e14fd06ed967d28eac7206d21f36
Author: zeertzjq <zeertzjq@outlook.com>
Date: Wed May 11 14:15:37 2022 +0100
patch 8.2.4939: matchfuzzypos() with "matchseq" does not have all positions
Problem: matchfuzzypos() with "matchseq" does not have all positions.
Solution: Also add a position for white space. (closes https://github.com/vim/vim/issues/10404)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 11 May 2022 15:30:03 +0200 |
parents | 405c5cf665b0 |
children | 2754c0b032dc |
files | runtime/doc/builtin.txt src/search.c src/testdir/test_matchfuzzy.vim src/version.c |
diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -5682,10 +5682,9 @@ matchfuzzy({list}, {str} [, {dict}]) * The optional {dict} argument always supports the following items: - matchseq When this item is present and {str} contains - multiple words separated by white space, then - returns only matches that contain the words in - the given sequence. + matchseq When this item is present return only matches + that contain the characters in {str} in the + given sequence. If {list} is a list of dictionaries, then the optional {dict} argument supports the following additional items:
--- a/src/search.c +++ b/src/search.c @@ -4729,7 +4729,7 @@ fuzzy_match_in_list( p = str; while (*p != NUL) { - if (!VIM_ISWHITE(PTR2CHAR(p))) + if (!VIM_ISWHITE(PTR2CHAR(p)) || matchseq) { if (list_append_number(items[match_count].lmatchpos, matches[j]) == FAIL)
--- a/src/testdir/test_matchfuzzy.vim +++ b/src/testdir/test_matchfuzzy.vim @@ -126,6 +126,9 @@ func Test_matchfuzzypos() " match multiple words (separated by space) call assert_equal([['foo bar baz'], [[8, 9, 10, 0, 1, 2]], [369]], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('baz foo')) + call assert_equal([[], [], []], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('baz foo', {'matchseq': 1})) + call assert_equal([['foo bar baz'], [[0, 1, 2, 8, 9, 10]], [369]], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('foo baz')) + call assert_equal([['foo bar baz'], [[0, 1, 2, 3, 4, 5, 10]], [326]], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('foo baz', {'matchseq': 1})) call assert_equal([[], [], []], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('one two')) call assert_equal([[], [], []], ['foo bar']->matchfuzzypos(" \t ")) call assert_equal([['grace'], [[1, 2, 3, 4, 2, 3, 4, 0, 1, 2, 3, 4]], [657]], ['grace']->matchfuzzypos('race ace grace'))