Commit: patch 9.0.2135: No test for mode() when executing Ex commands

[Christian Brabandt]

patch 9.0.2135: No test for mode() when executing Ex commands

Commit: https://github.com/vim/vim/commit/fcaeb3d42b228e73c669b2fce78f1d3fe112769f
Author: zeertzjq <zeer...@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 <zeer...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index f7cc8f88a..a4a097847 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6413,9 +6413,9 @@ mode([expr]) Return a string that indicates the current mode.
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
diff --git a/src/evalfunc.c b/src/evalfunc.c
index fa27d0d27..b0b975061 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -9733,7 +9733,7 @@ f_setenv(typval_T *argvars, typval_T *rettv UNUSED)
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())
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 0652a6fb6..cecb55aaf 100644
--- 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()
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 4cde9e40d..7bfe7fa75 100644
--- 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&
diff --git a/src/version.c b/src/version.c
index ae536261e..55fbcc5b2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 2135,
/**/
2134,
/**/