From 74776dfb2ac497ab63a80ceea07b38c142b2c048 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 29 Mar 2024 22:29:10 +0800 Subject: [PATCH] fix(terminal): fix duplicate recording with mouse click (#28103) --- src/nvim/terminal.c | 5 ++++- test/functional/terminal/mouse_spec.lua | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 3734d55a5b..9033e00f3d 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -1631,7 +1631,10 @@ end: return false; } - ins_char_typebuf(vgetc_char, vgetc_mod_mask); + int len = ins_char_typebuf(vgetc_char, vgetc_mod_mask); + if (KeyTyped) { + ungetchars(len); + } return true; } diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua index 0395d5ee16..08ec7b97cf 100644 --- a/test/functional/terminal/mouse_spec.lua +++ b/test/functional/terminal/mouse_spec.lua @@ -41,6 +41,7 @@ describe(':terminal mouse', function() end) it('will exit focus and trigger Normal mode mapping on mouse click', function() + feed([[qri]]) command('let g:got_leftmouse = 0') command('nnoremap let g:got_leftmouse = 1') eq('t', eval('mode(1)')) @@ -48,9 +49,12 @@ describe(':terminal mouse', function() feed('') eq('nt', eval('mode(1)')) eq(1, eval('g:got_leftmouse')) + feed('q') + eq('i', eval('keytrans(@r)')) end) it('will exit focus and trigger Normal mode mapping on mouse click with modifier', function() + feed([[qri]]) command('let g:got_ctrl_leftmouse = 0') command('nnoremap let g:got_ctrl_leftmouse = 1') eq('t', eval('mode(1)')) @@ -58,6 +62,8 @@ describe(':terminal mouse', function() feed('') eq('nt', eval('mode(1)')) eq(1, eval('g:got_ctrl_leftmouse')) + feed('q') + eq('i', eval('keytrans(@r)')) end) it('will exit focus on + mouse-scroll', function()