summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-04 18:53:35 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-04 18:53:35 +0100
commit66669fc6647201649e75a214e72b768fc86b7ed3 (patch)
tree37bd3c71e0d28ca0e1b42102f2247c8d59405d1a
parentf65b35b4465d3622128bd82bd3775f833542eb1f (diff)
patch 8.2.1955: Vim9: not all command modifiers are testedv8.2.1955
Problem: Vim9: not all command modifiers are tested. Solution: Add tests for remaining modifiers.
-rw-r--r--src/testdir/test_vim9_cmd.vim77
-rw-r--r--src/version.c2
2 files changed, 58 insertions, 21 deletions
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 71c47cdcef..6751483f04 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -478,15 +478,62 @@ def Test_command_modifiers_keep()
enddef
def Test_command_modifier_other()
- # TODO
- # hide
- # noautocmd
- # noswapfile
- # sandbox
- # silent
- # silent!
- # unsilent
- # verbose
+ new Xsomefile
+ setline(1, 'changed')
+ var buf = bufnr()
+ hide edit Xotherfile
+ var info = getbufinfo(buf)
+ assert_equal(1, info[0].hidden)
+ assert_equal(1, info[0].changed)
+ edit Xsomefile
+ bwipe!
+
+ au BufNewFile Xfile g:readFile = 1
+ g:readFile = 0
+ edit Xfile
+ assert_equal(1, g:readFile)
+ bwipe!
+ g:readFile = 0
+ noautocmd edit Xfile
+ assert_equal(0, g:readFile)
+
+ noswapfile edit XnoSwap
+ assert_equal(0, &l:swapfile)
+ bwipe!
+
+ var caught = false
+ try
+ sandbox !ls
+ catch /E48:/
+ caught = true
+ endtry
+ assert_true(caught)
+
+ :8verbose g:verbose_now = &verbose
+ assert_equal(8, g:verbose_now)
+ unlet g:verbose_now
+enddef
+
+def EchoHere()
+ echomsg 'here'
+enddef
+def EchoThere()
+ unsilent echomsg 'there'
+enddef
+
+def Test_modifier_silent_unsilent()
+ echomsg 'last one'
+ silent echomsg "text"
+ assert_equal("\nlast one", execute(':1messages'))
+
+ silent! echoerr "error"
+
+ echomsg 'last one'
+ silent EchoHere()
+ assert_equal("\nlast one", execute(':1messages'))
+
+ silent EchoThere()
+ assert_equal("\nthere", execute(':1messages'))
enddef
def Test_range_after_command_modifier()
@@ -587,17 +634,5 @@ def Test_f_args()
CheckScriptSuccess(lines)
enddef
-def Test_modifier_silent()
- echomsg 'last one'
- silent echomsg "text"
- redir => g:testmsg
- :1messages
- redir END
- assert_equal("\nlast one", g:testmsg)
- unlet g:testmsg
-
- silent! echoerr "error"
-enddef
-
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 231a4f0388..d4cddb8fbc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1955,
+/**/
1954,
/**/
1953,