summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-08-03 21:16:18 +0200
committerBram Moolenaar <Bram@vim.org>2021-08-03 21:16:18 +0200
commit23e2e115154ef0bf05d809024eed328a46ed0f82 (patch)
tree407dc5dee0995ddc053238391282e9b23c435402
parent51ad850f5fbafa7aa3f60affa74ec9c9f992c6cc (diff)
downloadvim-git-23e2e115154ef0bf05d809024eed328a46ed0f82.tar.gz
patch 8.2.3281: Vim9: TODO items in tests can be taken care ofv8.2.3281
Problem: Vim9: TODO items in tests can be taken care of. Solution: Update test for now working functionality. (closes #8694)
-rw-r--r--src/testdir/test_vim9_assign.vim16
-rw-r--r--src/testdir/test_vim9_func.vim5
-rw-r--r--src/testdir/test_vim9_script.vim6
-rw-r--r--src/version.c2
4 files changed, 8 insertions, 21 deletions
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index fa2654801..428de1c13 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1228,22 +1228,10 @@ def Test_assign_dict()
d.somekey = 'someval'
assert_equal({key: 'value', '123': 'qwerty', somekey: 'someval'}, d)
- # unlet d.somekey
- # assert_equal({key: 'value', '123': 'qwerty'}, d)
- END
- CheckDefAndScriptSuccess(lines)
-
- # TODO: move to above once "unlet d.somekey" in :def is implemented
- lines =<< trim END
- vim9script
- var d: dict<string> = {}
- d['key'] = 'value'
- d.somekey = 'someval'
- assert_equal({key: 'value', somekey: 'someval'}, d)
unlet d.somekey
- assert_equal({key: 'value'}, d)
+ assert_equal({key: 'value', '123': 'qwerty'}, d)
END
- CheckScriptSuccess(lines)
+ CheckDefAndScriptSuccess(lines)
CheckDefFailure(["var d: dict<number> = {a: '', b: true}"], 'E1012: Type mismatch; expected dict<number> but got dict<any>', 1)
CheckDefFailure(["var d: dict<dict<number>> = {x: {a: '', b: true}}"], 'E1012: Type mismatch; expected dict<dict<number>> but got dict<dict<any>>', 1)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 7e7ce3532..5fdd71792 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -2250,15 +2250,14 @@ def Test_double_nested_lambda()
enddef
def Test_nested_inline_lambda()
- # TODO: use the "text" argument
var lines =<< trim END
vim9script
def F(text: string): func(string): func(string): string
return (arg: string): func(string): string => ((sep: string): string => {
- return sep .. arg
+ return sep .. arg .. text
})
enddef
- assert_equal('--there', F('unused')('there')('--'))
+ assert_equal('--there++', F('++')('there')('--'))
END
CheckScriptSuccess(lines)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 9f99ebbd4..b11149a59 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -188,8 +188,7 @@ def Test_const()
var varlist = [7, 8]
const constlist = [1, varlist, 3]
varlist[0] = 77
- # TODO: does not work yet
- # constlist[1][1] = 88
+ constlist[1][1] = 88
var cl = constlist[1]
cl[1] = 88
constlist->assert_equal([1, [77, 88], 3])
@@ -197,8 +196,7 @@ def Test_const()
var vardict = {five: 5, six: 6}
const constdict = {one: 1, two: vardict, three: 3}
vardict['five'] = 55
- # TODO: does not work yet
- # constdict['two']['six'] = 66
+ constdict['two']['six'] = 66
var cd = constdict['two']
cd['six'] = 66
constdict->assert_equal({one: 1, two: {five: 55, six: 66}, three: 3})
diff --git a/src/version.c b/src/version.c
index 32403f45c..251f26f11 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3281,
+/**/
3280,
/**/
3279,