Mercurial > vim
changeset 33848:c3804ff17204 v9.0.2135
patch 9.0.2135: No test for mode() when executing Ex commands
Commit: https://github.com/vim/vim/commit/fcaeb3d42b228e73c669b2fce78f1d3fe112769f
Author: zeertzjq <zeertzjq@outlook.com>
Date: Tue Nov 28 20:46:29 2023 +0100
patch 9.0.2135: No test for mode() when executing Ex commands
Problem: No test for mode() when executing Ex commands
Solution: Add some test cases and simplify several other test cases.
Also add a few more test cases for ModeChanged.
closes: #13588
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 28 Nov 2023 21:00:06 +0100 |
| parents | 11f5d2f8c13e |
| children | a574c1902d65 |
| files | runtime/doc/builtin.txt src/evalfunc.c src/testdir/test_autocmd.vim src/testdir/test_functions.vim src/version.c |
| diffstat | 5 files changed, 30 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -6413,9 +6413,9 @@ mode([expr]) Return a string that indica Rvx Virtual Replace mode |i_CTRL-X| completion c Command-line editing ct Command-line editing via Terminal-Job mode - cr Command-line while in overstrike mode |c_<Insert>| + cr Command-line editing overstrike mode |c_<Insert>| cv Vim Ex mode |gQ| - cvr Vim Ex while in overstrike mode |c_<Insert>| + cvr Vim Ex mode while in overstrike mode |c_<Insert>| ce Normal Ex mode |Q| r Hit-enter prompt rm The -- more -- prompt
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -9733,7 +9733,7 @@ f_setenv(typval_T *argvars, typval_T *re if (in_vim9script() && check_for_string_arg(argvars, 0) == FAIL) return; - // seting an environment variable may be dangerous, e.g. you could + // setting an environment variable may be dangerous, e.g. you could // setenv GCONV_PATH=/tmp and then have iconv() unexpectedly call // a shell command using some shared library: if (check_restricted() || check_secure())
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -3780,8 +3780,6 @@ func Test_mode_changes() call assert_equal(len(g:mode_seq) - 1, g:index) call assert_equal(2, g:n_to_c) call assert_equal(2, g:c_to_n) - unlet g:n_to_c - unlet g:c_to_n let g:n_to_v = 0 au ModeChanged n:v let g:n_to_v += 1 @@ -3792,8 +3790,10 @@ func Test_mode_changes() call assert_equal(len(g:mode_seq) - 1, g:index) call assert_equal(1, g:n_to_v) call assert_equal(1, g:v_to_n) - unlet g:n_to_v - unlet g:v_to_n + + let g:mode_seq += ['c', 'cr', 'c', 'cr', 'n'] + call feedkeys(":\<Insert>\<Insert>\<Insert>\<CR>", 'tnix') + call assert_equal(len(g:mode_seq) - 1, g:index) au! ModeChanged delfunc TestMode @@ -3808,6 +3808,10 @@ func Test_mode_changes() unlet! g:i_to_n unlet! g:nori_to_any unlet! g:i_to_any + unlet! g:n_to_c + unlet! g:c_to_n + unlet! g:n_to_v + unlet! g:v_to_n endfunc func Test_recursive_ModeChanged()
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -755,7 +755,7 @@ func Test_mode() " Only complete from the current buffer. set complete=. - inoremap <F2> <C-R>=Save_mode()<CR> + noremap! <F2> <C-R>=Save_mode()<CR> xnoremap <F2> <Cmd>call Save_mode()<CR> normal! 3G @@ -914,17 +914,24 @@ func Test_mode() exe "normal g\<C-H>\<C-O>\<F2>\<Esc>" call assert_equal("\<C-V>-\<C-V>s", g:current_modes) - call feedkeys(":echo \<C-R>=Save_mode()\<C-U>\<CR>", 'xt') + call feedkeys(":\<F2>\<CR>", 'xt') call assert_equal('c-c', g:current_modes) - call feedkeys(":\<insert>\<C-r>=Save_mode()\<CR>",'xt') + call feedkeys(":\<Insert>\<F2>\<CR>", 'xt') call assert_equal("c-cr", g:current_modes) - call feedkeys("gQecho \<C-R>=Save_mode()\<CR>\<CR>vi\<CR>", 'xt') + call feedkeys("gQ\<F2>vi\<CR>", 'xt') call assert_equal('c-cv', g:current_modes) - call feedkeys("gQ\<insert>\<C-r>=Save_mode()\<CR>",'xt') + call feedkeys("gQ\<Insert>\<F2>vi\<CR>", 'xt') call assert_equal("c-cvr", g:current_modes) + + " Executing commands in Vim Ex mode should return "cv", never "cvr", + " as Cmdline editing has already ended. + call feedkeys("gQcall Save_mode()\<CR>vi\<CR>", 'xt') + call assert_equal('c-cv', g:current_modes) + call feedkeys("gQ\<Insert>call Save_mode()\<CR>vi\<CR>", 'xt') + call assert_equal('c-cv', g:current_modes) + call feedkeys("Qcall Save_mode()\<CR>vi\<CR>", 'xt') call assert_equal('c-ce', g:current_modes) - " How to test Ex mode? " Test mode in operatorfunc (it used to be Operator-pending). set operatorfunc=OperatorFunc @@ -939,14 +946,15 @@ func Test_mode() call assert_equal('n-niR', g:current_modes) execute "normal! gR\<C-o>g@l\<Esc>" call assert_equal('n-niV', g:current_modes) - " Test statusline updates for overstike mode + + " Test statusline updates for overstrike mode if CanRunVimInTerminal() let buf = RunVimInTerminal('', {'rows': 12}) call term_sendkeys(buf, ":set laststatus=2 statusline=%!mode(1)\<CR>") call term_sendkeys(buf, ":") call TermWait(buf) call VerifyScreenDump(buf, 'Test_mode_1', {}) - call term_sendkeys(buf, "\<insert>") + call term_sendkeys(buf, "\<Insert>") call TermWait(buf) call VerifyScreenDump(buf, 'Test_mode_2', {}) call StopVimInTerminal(buf) @@ -971,7 +979,7 @@ func Test_mode() endif bwipe! - iunmap <F2> + unmap! <F2> xunmap <F2> set complete& set operatorfunc&