patch 9.0.1660: error for using matchfuzzy() returning a list of dicts
Problem: Error for using matchfuzzy() in Vim9 script returning a list of
dicts.
Solution: Make return type of matchfuzzy() list<any>. (Yegappan Lakshmanan,
closes #12574)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 63ca048..d644a3e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2224,7 +2224,7 @@
{"matchend", 2, 4, FEARG_1, arg24_match_func,
ret_number, f_matchend},
{"matchfuzzy", 2, 3, FEARG_1, arg3_list_string_dict,
- ret_list_string, f_matchfuzzy},
+ ret_list_any, f_matchfuzzy},
{"matchfuzzypos", 2, 3, FEARG_1, arg3_list_string_dict,
ret_list_any, f_matchfuzzypos},
{"matchlist", 2, 4, FEARG_1, arg24_match_func,
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index b76db7d..23a6835 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2821,6 +2821,15 @@
v9.CheckDefAndScriptFailure(['matchfuzzy([], 1)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
v9.CheckDefAndScriptFailure(['matchfuzzy([], "a", [])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<unknown>', 'E1206: Dictionary required for argument 3'])
matchfuzzy(['abc', 'xyz'], '')->assert_equal([])
+ var lines =<< trim END
+ var items = [{name: 'xyz', id: 1}, {name: 'def', id: 2},
+ {name: 'abc', id: 3}]
+ var l: list<dict<any>> = matchfuzzy(items, 'abc', {key: 'name'})
+ assert_equal([{name: 'abc', id: 3}], l)
+ var k: list<string> = matchfuzzy(['one', 'two', 'who'], 'o')
+ assert_equal(['one', 'two', 'who'], k)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
enddef
def Test_matchfuzzypos()
@@ -2828,6 +2837,15 @@
v9.CheckDefAndScriptFailure(['matchfuzzypos([], 1)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
v9.CheckDefAndScriptFailure(['matchfuzzypos([], "a", [])'], ['E1013: Argument 3: type mismatch, expected dict<any> but got list<unknown>', 'E1206: Dictionary required for argument 3'])
matchfuzzypos(['abc', 'xyz'], '')->assert_equal([[], [], []])
+ var lines =<< trim END
+ var items = [{name: 'xyz', id: 1}, {name: 'def', id: 2},
+ {name: 'abc', id: 3}]
+ var l: list<dict<any>> = matchfuzzypos(items, 'abc', {key: 'name'})[0]
+ assert_equal([{name: 'abc', id: 3}], l)
+ var k: list<string> = matchfuzzypos(['one', 'two', 'who'], 'o')[0]
+ assert_equal(['one', 'two', 'who'], k)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
enddef
def Test_matchlist()
diff --git a/src/version.c b/src/version.c
index e174f58..ba99907 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1660,
+/**/
1659,
/**/
1658,