patch 8.2.3991: Vim9: error when extending dict<any>
Problem: Vim9: error when extending dict<any> with another type that it was
initialized with.
Solution: Also set the type for dict<any> if the initializer has a more
specific type. (closes #9461)
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 6831809..223a6e4 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -757,6 +757,10 @@
# type becomes list<any>
var somelist = rand() > 0 ? [1, 2, 3] : ['a', 'b', 'c']
+ # type is list<any> even though initializer is list<number>
+ var anyList: list<any> = [0]
+ assert_equal([0, 'x'], extend(anyList, ['x']))
+
var lines =<< trim END
var d = {dd: test_null_list()}
d.dd[0] = 0
@@ -955,6 +959,10 @@
# type becomes dict<any>
var somedict = rand() > 0 ? {a: 1, b: 2} : {a: 'a', b: 'b'}
+ # type is dict<any> even though initializer is dict<number>
+ var anyDict: dict<any> = {a: 0}
+ assert_equal({a: 0, b: 'x'}, extend(anyDict, {b: 'x'}))
+
# assignment to script-local dict
lines =<< trim END
vim9script
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 2ee1a93..df27dba 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2143,6 +2143,11 @@
CheckDefAndScriptFailure(['map(test_null_channel(), "1")'], ['E1013: Argument 1: type mismatch, expected list<any> but got channel', 'E1251: List, Dictionary, Blob or String required for argument 1'])
endif
CheckDefAndScriptFailure(['map(1, "1")'], ['E1013: Argument 1: type mismatch, expected list<any> but got number', 'E1251: List, Dictionary, Blob or String required for argument 1'])
+
+ # type of dict remains dict<any> even when type of values changes
+ var d: dict<any> = {a: 0}
+ d->map((k, v) => true)
+ d->map((k, v) => 'x')
enddef
def Test_map_failure()
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 1cdf7d4..0ec1700 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -439,6 +439,8 @@
enddef
def Test_return_list_any()
+ # This used to fail but now the actual list type is checked, and since it has
+ # an item of type string it can be used as list<string>.
var lines =<< trim END
vim9script
def Func(): list<string>
@@ -448,7 +450,8 @@
enddef
echo Func()
END
- CheckScriptFailure(lines, 'E1012:')
+ CheckScriptSuccess(lines)
+
lines =<< trim END
vim9script
def Func(): list<string>
@@ -458,7 +461,7 @@
enddef
echo Func()
END
- CheckScriptFailure(lines, 'E1012:')
+ CheckScriptSuccess(lines)
enddef
func Increment()