IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1490: the ModeChanged event may be triggered too often

Browse Source 
Problem:    The ModeChanged event may be triggered too often.
Solution:   Only trigger ModeChanged when no operator is pending.
            (closes vim/vim#12298)

73916bac5a
This commit is contained in:
zeertzjq 2023-04-26 23:53:55 +08:00
parent 9f0762f1fe
commit e0d6703a6a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/normal.c
View File

@ -956,10 +956,12 @@ normal_end:
set_reg_var(get_default_register_name()); set_reg_var(get_default_register_name());
} }
// Reset finish_op, in case it was set
s->c = finish_op; s->c = finish_op;
finish_op = false; if (s->oa.op_type == OP_NOP) {
may_trigger_modechanged(); // Reset finish_op, in case it was set
finish_op = false;
may_trigger_modechanged();
}
// Redraw the cursor with another shape, if we were in Operator-pending // Redraw the cursor with another shape, if we were in Operator-pending
// mode or did a replace command. // mode or did a replace command.
if (s->c || s->ca.cmdchar == 'r' if (s->c || s->ca.cmdchar == 'r'
@ -1729,9 +1731,9 @@ void prep_redo_num2(int regname, long num1, int cmd1, int cmd2, long num2, int c
} }
} }
/// check for operator active and clear it /// Check for operator active and clear it.
/// ///
/// @return true if operator was active /// Beep and return true if an operator was active.
static bool checkclearop(oparg_T *oap) static bool checkclearop(oparg_T *oap)
{ {
if (oap->op_type == OP_NOP) { if (oap->op_type == OP_NOP) {
@ -1743,7 +1745,7 @@ static bool checkclearop(oparg_T *oap)
/// Check for operator or Visual active. Clear active operator. /// Check for operator or Visual active. Clear active operator.
/// ///
/// @return true if operator or Visual was active. /// Beep and return true if an operator or Visual was active.
static bool checkclearopq(oparg_T *oap) static bool checkclearopq(oparg_T *oap)
{ {
if (oap->op_type == OP_NOP && !VIsual_active) { if (oap->op_type == OP_NOP && !VIsual_active) {

4
test/old/testdir/test_autocmd.vim
View File

@ -3453,7 +3453,7 @@ endfunc
" Test for ModeChanged pattern " Test for ModeChanged pattern
func Test_mode_changes() func Test_mode_changes()
let g:index = 0 let g:index = 0
let g:mode_seq = ['n', 'i', 'n', 'v', 'V', 'i', 'ix', 'i', 'ic', 'i', 'n', 'no', 'n', 'V', 'v', 's', 'n'] let g:mode_seq = ['n', 'i', 'n', 'v', 'V', 'i', 'ix', 'i', 'ic', 'i', 'n', 'no', 'noV', 'n', 'V', 'v', 's', 'n']
func! TestMode() func! TestMode()
call assert_equal(g:mode_seq[g:index], get(v:event, "old_mode")) call assert_equal(g:mode_seq[g:index], get(v:event, "old_mode"))
call assert_equal(g:mode_seq[g:index + 1], get(v:event, "new_mode")) call assert_equal(g:mode_seq[g:index + 1], get(v:event, "new_mode"))
@ -3464,7 +3464,7 @@ func Test_mode_changes()
au ModeChanged * :call TestMode() au ModeChanged * :call TestMode()
let g:n_to_any = 0 let g:n_to_any = 0
au ModeChanged n:* let g:n_to_any += 1 au ModeChanged n:* let g:n_to_any += 1
call feedkeys("i\<esc>vVca\<CR>\<C-X>\<C-L>\<esc>ggdG", 'tnix') call feedkeys("i\<esc>vVca\<CR>\<C-X>\<C-L>\<esc>ggdV\<MouseMove>G", 'tnix')
let g:V_to_v = 0 let g:V_to_v = 0
au ModeChanged V:v let g:V_to_v += 1 au ModeChanged V:v let g:V_to_v += 1