patch 8.2.4529: Vim9: comparing partial with function fails
Problem: Vim9: comparing partial with function fails.
Solution: Support this comparison. Avoid a crash. (closes #9909)
Add more test cases.
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 7577aec..8b9dbd6 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -1687,6 +1687,7 @@
endif
$SOMEENVVAR = 'some'
assert_equal('some', getenv('SOMEENVVAR'))
+ assert_notequal(null, getenv('SOMEENVVAR'))
unlet $SOMEENVVAR
getenv('')->assert_equal(v:null)
enddef
@@ -4398,7 +4399,7 @@
if has('float')
assert_equal('func([unknown], [unknown]): float', typename(function('pow')))
endif
- assert_equal('func', test_null_partial()->typename())
+ assert_equal('func(...): unknown', test_null_partial()->typename())
assert_equal('list<unknown>', test_null_list()->typename())
assert_equal('dict<unknown>', test_null_dict()->typename())
if has('job')
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index a38254f..4a3803a 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -717,21 +717,33 @@
g:not_null_list = []
var lines =<< trim END
assert_true(test_null_blob() == v:null)
+ assert_true(null_blob == null)
assert_true(v:null == test_null_blob())
+ assert_true(null == null_blob)
assert_false(test_null_blob() != v:null)
+ assert_false(null_blob != null)
assert_false(v:null != test_null_blob())
+ assert_false(null != null_blob)
if has('channel')
assert_true(test_null_channel() == v:null)
+ assert_true(null_channel == null)
assert_true(v:null == test_null_channel())
+ assert_true(null == null_channel)
assert_false(test_null_channel() != v:null)
+ assert_false(null_channel != null)
assert_false(v:null != test_null_channel())
+ assert_false(null != null_channel)
endif
assert_true(test_null_dict() == v:null)
+ assert_true(null_dict == null)
assert_true(v:null == test_null_dict())
+ assert_true(null == null_dict)
assert_false(test_null_dict() != v:null)
+ assert_false(null_dict != null)
assert_false(v:null != test_null_dict())
+ assert_false(null != null_dict)
assert_true(g:null_dict == v:null)
assert_true(v:null == g:null_dict)
@@ -739,21 +751,33 @@
assert_false(v:null != g:null_dict)
assert_true(test_null_function() == v:null)
+ assert_true(null_function == null)
assert_true(v:null == test_null_function())
+ assert_true(null == null_function)
assert_false(test_null_function() != v:null)
+ assert_false(null_function != null)
assert_false(v:null != test_null_function())
+ assert_false(null != null_function)
if has('job')
assert_true(test_null_job() == v:null)
+ assert_true(null_job == null)
assert_true(v:null == test_null_job())
+ assert_true(null == null_job)
assert_false(test_null_job() != v:null)
+ assert_false(null_job != null)
assert_false(v:null != test_null_job())
+ assert_false(null != null_job)
endif
assert_true(test_null_list() == v:null)
+ assert_true(null_list == null)
assert_true(v:null == test_null_list())
+ assert_true(null == null_list)
assert_false(test_null_list() != v:null)
+ assert_false(null_list != null)
assert_false(v:null != test_null_list())
+ assert_false(null != null_list)
assert_false(g:not_null_list == v:null)
assert_false(v:null == g:not_null_list)
@@ -761,19 +785,33 @@
assert_true(v:null != g:not_null_list)
assert_true(test_null_partial() == v:null)
+ assert_true(null_partial == null)
assert_true(v:null == test_null_partial())
+ assert_true(null == null_partial)
assert_false(test_null_partial() != v:null)
+ assert_false(null_partial != null)
assert_false(v:null != test_null_partial())
+ assert_false(null != null_partial)
assert_true(test_null_string() == v:null)
+ assert_true(null_string == null)
assert_true(v:null == test_null_string())
+ assert_true(null == null_string)
assert_false(test_null_string() != v:null)
+ assert_false(null_string != null)
assert_false(v:null != test_null_string())
+ assert_false(null != null_string)
END
v9.CheckDefAndScriptSuccess(lines)
unlet g:null_dict
unlet g:not_null_list
+ lines =<< trim END
+ var d: dict<func> = {f: null_function}
+ assert_equal(null_function, d.f)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
+
v9.CheckDefAndScriptFailure(['echo 123 == v:null'], 'E1072: Cannot compare number with special')
v9.CheckDefAndScriptFailure(['echo v:null == 123'], 'E1072: Cannot compare special with number')
v9.CheckDefAndScriptFailure(['echo 123 != v:null'], 'E1072: Cannot compare number with special')
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 131413b..85e8e9d 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -3341,7 +3341,7 @@
var lines =<< trim END
var d: dict<func> = {f: null_function}
var Ref = d.f
- assert_equal('func', typename(Ref))
+ assert_equal('func(...): unknown', typename(Ref))
END
v9.CheckDefAndScriptSuccess(lines)
enddef
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index 24dfd1b..ce3dbca 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -6571,6 +6571,9 @@
call assert_false(v:true is 1)
call assert_false(v:true is v:false)
call assert_false(v:none is 0)
+ call assert_false(v:none is [])
+ call assert_false(v:none is {})
+ call assert_false(v:none is 'text')
call assert_false(v:null is 0)
call assert_false(v:null is v:none)