patch 9.0.2163: Vim9: type can be assigned to list/dict
Problem: Vim9: type can be assigned to list/dict
Solution: Prevent assigning a `type` to a `list` or `dict`
closes: #13683
Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index e288d03..38504f1 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -3361,4 +3361,94 @@
endfor
enddef
+def Test_assign_type_to_list_dict()
+ var lines =<< trim END
+ vim9script
+ class C
+ endclass
+
+ var x = [C]
+ END
+ v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
+
+ lines =<< trim END
+ vim9script
+ class C
+ endclass
+ type T = C
+
+ def F()
+ var x = [3, T, C]
+ enddef
+ F()
+ END
+ v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
+
+ lines =<< trim END
+ vim9script
+ type T = number
+
+ def F()
+ var x = [3, T]
+ enddef
+ F()
+ END
+ v9.CheckScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value')
+
+ lines =<< trim END
+ vim9script
+ class C
+ endclass
+
+ var x = {e: C}
+ END
+ v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
+
+ lines =<< trim END
+ vim9script
+ class C
+ endclass
+
+ def F()
+ var x = {e: C}
+ enddef
+ F()
+ END
+ v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
+
+ lines =<< trim END
+ vim9script
+ type T = number
+
+ def F()
+ var x = {e: T}
+ enddef
+ F()
+ END
+ v9.CheckScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value')
+
+ lines =<< trim END
+ vim9script
+ class C
+ endclass
+
+ def F()
+ var x = {e: [C]}
+ enddef
+ F()
+ END
+ v9.CheckScriptFailure(lines, 'E1405: Class "C" cannot be used as a value')
+
+ lines =<< trim END
+ vim9script
+ type T = number
+
+ def F()
+ var x = {e: [T]}
+ enddef
+ F()
+ END
+ v9.CheckScriptFailure(lines, 'E1407: Cannot use a Typealias as a variable or value')
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index c196588..5a9b0f8 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -190,7 +190,7 @@
endclass
sort([1.1, A], 'f')
END
- v9.CheckSourceFailure(lines, 'E1321: Using a Class as a Float', 4)
+ v9.CheckSourceFailure(lines, 'E1405: Class "A" cannot be used as a value', 4)
# Test for using object as a float
lines =<< trim END
diff --git a/src/testdir/test_vim9_typealias.vim b/src/testdir/test_vim9_typealias.vim
index 2082934..11aa47a 100644
--- a/src/testdir/test_vim9_typealias.vim
+++ b/src/testdir/test_vim9_typealias.vim
@@ -277,7 +277,7 @@
type B = number
sort([1.1, B], 'f')
END
- v9.CheckSourceFailure(lines, 'E1401: Using type alias "B" as a Float', 3)
+ v9.CheckSourceFailure(lines, 'E1403: Type alias "B" cannot be used as a value', 3)
# Creating a typealias in a def function
lines =<< trim END