diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-06 08:53:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 08:53:24 +0800 |
| commit | be90bfbb00436fba68595cc4fd67548df794469d (patch) | |
| tree | f10a2b87f759af1ce4a147e2588f9ee30e759c6b /src/nvim/testdir | |
| parent | 5b8d8a4c9925526fd34d2187b1bd3efe18792792 (diff) | |
| parent | 7d7208a88b2bb078c9c2727e93ef390f2a564027 (diff) | |
| download | rneovim-be90bfbb00436fba68595cc4fd67548df794469d.tar.gz rneovim-be90bfbb00436fba68595cc4fd67548df794469d.tar.bz2 rneovim-be90bfbb00436fba68595cc4fd67548df794469d.zip | |
Merge pull request #20954 from zeertzjq/vim-8.2.2918
vim-patch:8.2.{1274,1306,2722,2723,3016}: eval error message improvements
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/test_let.vim | 12 | ||||
| -rw-r--r-- | src/nvim/testdir/test_listdict.vim | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_vimscript.vim | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_let.vim b/src/nvim/testdir/test_let.vim index f05e06f774..48c5699093 100644 --- a/src/nvim/testdir/test_let.vim +++ b/src/nvim/testdir/test_let.vim @@ -281,15 +281,23 @@ func Test_let_errors() let l = [[1,2]] call assert_fails('let l[:][0] = [5]', 'E708:') let d = {'k' : 4} - call assert_fails('let d.# = 5', 'E713:') - call assert_fails('let d.m += 5', 'E734:') + call assert_fails('let d.# = 5', 'E488:') + call assert_fails('let d.m += 5', 'E716:') + call assert_fails('let m = d[{]', 'E15:') let l = [1, 2] call assert_fails('let l[2] = 0', 'E684:') call assert_fails('let l[0:1] = [1, 2, 3]', 'E710:') call assert_fails('let l[-2:-3] = [3, 4]', 'E684:') call assert_fails('let l[0:4] = [5, 6]', 'E711:') + call assert_fails('let l -= 2', 'E734:') + call assert_fails('let l += 2', 'E734:') call assert_fails('let g:["a;b"] = 10', 'E461:') call assert_fails('let g:.min = function("max")', 'E704:') + if has('channel') + let ch = test_null_channel() + call assert_fails('let ch += 1', 'E734:') + endif + call assert_fails('let name = "a" .. "b",', 'E488: Trailing characters: ,') " This test works only when the language is English if v:lang == "C" || v:lang =~ '^[Ee]n' diff --git a/src/nvim/testdir/test_listdict.vim b/src/nvim/testdir/test_listdict.vim index ecf95ba8c0..21d21ce428 100644 --- a/src/nvim/testdir/test_listdict.vim +++ b/src/nvim/testdir/test_listdict.vim @@ -289,6 +289,13 @@ func Test_dict_func() call assert_equal('xxx3', Fn('xxx')) endfunc +func Test_dict_assign() + let d = {} + let d.1 = 1 + let d._ = 2 + call assert_equal({'1': 1, '_': 2}, d) +endfunc + " Function in script-local List or Dict func Test_script_local_dict_func() let g:dict = {} diff --git a/src/nvim/testdir/test_vimscript.vim b/src/nvim/testdir/test_vimscript.vim index 8faa9135e5..44904af160 100644 --- a/src/nvim/testdir/test_vimscript.vim +++ b/src/nvim/testdir/test_vimscript.vim @@ -5569,7 +5569,7 @@ func Test_expr_eval_error_msg() call T(19, '{(1} + CONT(19)', 'E110', "Missing ')'") call T(20, '("abc"[1) + CONT(20)', 'E111', "Missing ']'") call T(21, '(1 +) + CONT(21)', 'E15', "Invalid expression") - call T(22, '1 2 + CONT(22)', 'E15', "Invalid expression") + call T(22, '1 2 + CONT(22)', 'E488', "Trailing characters: 2 +") call T(23, '(1 ? 2) + CONT(23)', 'E109', "Missing ':' after '?'") call T(24, '("abc) + CONT(24)', 'E114', "Missing quote") call T(25, "('abc) + CONT(25)", 'E115', "Missing quote") |