patch 8.2.2881: various pieces of code not covered by tests
Problem: Various pieces of code not covered by tests.
Solution: Add a few more tests. (Yegappan Lakshmanan, closes #8245)
diff --git a/src/testdir/test_const.vim b/src/testdir/test_const.vim
index c88efa6..2b79f42 100644
--- a/src/testdir/test_const.vim
+++ b/src/testdir/test_const.vim
@@ -223,8 +223,28 @@
call add(val, 4)
call assert_equal([9, 2, 3, 4], val)
call assert_fails('let val = [4, 5, 6]', 'E1122:')
-endfunc
+ let l =<< trim END
+ let d = {}
+ lockvar d
+ func d.fn()
+ return 1
+ endfunc
+ END
+ let @a = l->join("\n")
+ call assert_fails('exe @a', 'E741:')
+
+ let l =<< trim END
+ let d = {}
+ let d.fn = function("min")
+ lockvar d.fn
+ func! d.fn()
+ return 1
+ endfunc
+ END
+ let @a = l->join("\n")
+ call assert_fails('exe @a', 'E741:')
+endfunc
func Test_const_with_index_access()
let l = [1, 2, 3]
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index b4d462b..dcc2b04 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1843,6 +1843,10 @@
call writefile(['func ExistingFunction()', 'echo "yes"', 'endfunc'], 'Xfuncexists2')
call assert_fails('source Xfuncexists2', 'E122:')
+ " Defining a new function from the cmdline should fail if the function is
+ " already defined
+ call assert_fails('call feedkeys(":func ExistingFunction()\<CR>", "xt")', 'E122:')
+
delfunc ExistingFunction
call assert_equal(0, exists('*ExistingFunction'))
call writefile([
diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim
index 84c9173..89afa2b 100644
--- a/src/testdir/test_python2.vim
+++ b/src/testdir/test_python2.vim
@@ -314,6 +314,8 @@
10new
py vim.current.window.height = 5
call assert_equal(5, winheight(0))
+ py vim.current.window.height = 3.2
+ call assert_equal(3, winheight(0))
" Test for setting the window width
10vnew
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 1e9ef82..66d5db5 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -511,6 +511,8 @@
10new
py3 vim.current.window.height = 5
call assert_equal(5, winheight(0))
+ py3 vim.current.window.height = 3.2
+ call assert_equal(3, winheight(0))
" Test for setting the window width
10vnew
diff --git a/src/testdir/test_user_func.vim b/src/testdir/test_user_func.vim
index a58aa64..4b8ec99 100644
--- a/src/testdir/test_user_func.vim
+++ b/src/testdir/test_user_func.vim
@@ -405,6 +405,7 @@
let l = join(lines, "\n") . "\n"
exe l
call assert_fails('exe l', 'E717:')
+ call assert_fails('call feedkeys(":func d.F1()\<CR>", "xt")', 'E717:')
" Define an autoload function with an incorrect file name
call writefile(['func foo#Bar()', 'return 1', 'endfunc'], 'Xscript')
@@ -420,6 +421,11 @@
call assert_fails('delfunction Xabc', 'E130:')
let d = {'a' : 10}
call assert_fails('delfunc d.a', 'E718:')
+ func d.fn()
+ return 1
+ endfunc
+ delfunc d.fn
+ call assert_equal({'a' : 10}, d)
endfunc
" Test for calling return outside of a function
@@ -451,11 +457,12 @@
return len(self)
endfunc
- call assert_equal("{'a': 'b', 'somefunc': function('2')}", string(mydict))
+ call assert_equal("{'a': 'b', 'somefunc': function('3')}", string(mydict))
call assert_equal(2, mydict.somefunc())
call assert_match("^\n function \\d\\\+() dict"
\ .. "\n1 return len(self)"
\ .. "\n endfunction$", execute('func mydict.somefunc'))
+ call assert_fails('call mydict.nonexist()', 'E716:')
endfunc
func Test_func_range()
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index fe5de29..4a67522 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1941,6 +1941,9 @@
CheckDefAndScriptFailure(["var Ref = (a)=>a + 1"], 'E1004:')
CheckDefAndScriptFailure(["var Ref = (a)=> a + 1"], 'E1004: White space required before and after ''=>'' at "=> a + 1"')
CheckDefAndScriptFailure(["var Ref = (a) =>a + 1"], 'E1004:')
+ CheckDefAndScriptFailure2(["var Ref = (a) =< a + 1"], 'E1001:', 'E121:')
+ CheckDefAndScriptFailure(["var Ref = (a: int) => a + 1"], 'E1010:')
+ CheckDefAndScriptFailure(["var Ref = (a): int => a + 1"], 'E1010:')
CheckDefAndScriptFailure(["filter([1, 2], (k,v) => 1)"], 'E1069:', 1)
# error is in first line of the lambda
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 7eca709..2ac97d0 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -887,6 +887,12 @@
END
CheckDefAndScriptFailure(lines, 'E1157:', 1)
+ # no space before the return type
+ lines =<< trim END
+ var Ref = (x):number => x + 1
+ END
+ CheckDefAndScriptFailure(lines, 'E1069:', 1)
+
# this works
for x in ['foo', 'boo']
echo FilterWithCond(x, (v) => v =~ '^b')
@@ -1318,6 +1324,7 @@
enddef
END
CheckScriptFailure(lines, 'E1068:')
+ call assert_fails('vim9cmd echo stridx("a" .. "b" , "a")', 'E1068:')
enddef
def Test_white_space_after_comma()