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 #10404)
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 60fe91f..7d62583 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5682,10 +5682,9 @@
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:
diff --git a/src/search.c b/src/search.c
index cd5166f..353a6eb 100644
--- a/src/search.c
+++ b/src/search.c
@@ -4729,7 +4729,7 @@
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)
diff --git a/src/testdir/test_matchfuzzy.vim b/src/testdir/test_matchfuzzy.vim
index 8c0477c..b397392 100644
--- a/src/testdir/test_matchfuzzy.vim
+++ b/src/testdir/test_matchfuzzy.vim
@@ -126,6 +126,9 @@
" 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'))
diff --git a/src/version.c b/src/version.c
index 0a3a5df..304adc5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4939,
+/**/
4938,
/**/
4937,