Merge pull request #17168 from zeertzjq/ins-char-typebuf-mods

fix(input): put modifiers back into typeahead buffer when needed

2 files changed, 41 insertions, 6 deletions

diff --git a/test/functional/editor/meta_key_spec.lua b/test/functional/editor/meta_key_spec.lua
index 2280f5bb24..f811b8ae8d 100644
--- a/test/functional/editor/meta_key_spec.lua
+++ b/test/functional/editor/meta_key_spec.lua
@@ -27,6 +27,14 @@ describe('meta-keys #8226 #13042', function()
     command('nnoremap <A-j> Aalt-j<Esc>')
     feed('<A-j><M-l>')
     expect('llo<ESC>;<ESC>;alt-jmeta-l')
+    -- Unmapped ALT-chord with characters containing K_SPECIAL bytes
+    command('nnoremap … A…<Esc>')
+    feed('<A-…><M-…>')
+    expect('llo<ESC>;<ESC>;alt-jmeta-l<ESC>…<ESC>…')
+    command("execute 'nnoremap' nr2char(0x40000000) 'AMAX<Esc>'")
+    command("call nvim_input('<A-'.nr2char(0x40000000).'>')")
+    command("call nvim_input('<M-'.nr2char(0x40000000).'>')")
+    expect('llo<ESC>;<ESC>;alt-jmeta-l<ESC>…<ESC>…<ESC>MAX<ESC>MAX')
   end)
 
   it('ALT/META, visual-mode', function()
@@ -36,13 +44,20 @@ describe('meta-keys #8226 #13042', function()
     expect('peach')
     -- Unmapped ALT-chord resolves isolated (non-ALT) ESC mapping. #13086 #15869
     command('vnoremap <ESC> A<lt>ESC>')
-    feed('viw<A-;><ESC>viw<M-;><ESC>')
+    feed('viw<A-;><Esc>viw<M-;><Esc>')
     expect('peach<ESC>;<ESC>;')
     -- Mapped ALT-chord behaves as mapped.
     command('vnoremap <M-l> Ameta-l<Esc>')
     command('vnoremap <A-j> Aalt-j<Esc>')
     feed('viw<A-j>viw<M-l>')
     expect('peach<ESC>;<ESC>;alt-jmeta-l')
+    -- Unmapped ALT-chord with characters containing K_SPECIAL bytes
+    feed('viw<A-…><Esc>viw<M-…><Esc>')
+    expect('peach<ESC>;<ESC>;alt-jmeta-l<ESC>…<ESC>…')
+    command("execute 'inoremap' nr2char(0x40000000) 'MAX'")
+    command("call nvim_input('viw<A-'.nr2char(0x40000000).'><Esc>')")
+    command("call nvim_input('viw<M-'.nr2char(0x40000000).'><Esc>')")
+    expect('peach<ESC>;<ESC>;alt-jmeta-l<ESC>…<ESC>…<ESC>MAX<ESC>MAX')
   end)
 
   it('ALT/META insert-mode', function()
diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua
index 780a0b9b5a..6e2c851df7 100644
--- a/test/functional/terminal/mouse_spec.lua
+++ b/test/functional/terminal/mouse_spec.lua
@@ -1,7 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local clear, eq, eval = helpers.clear, helpers.eq, helpers.eval
-local feed, nvim = helpers.feed, helpers.nvim
+local feed, nvim, command = helpers.feed, helpers.nvim, helpers.command
 local feed_data = thelpers.feed_data
 
 describe(':terminal mouse', function()
@@ -10,9 +10,9 @@ describe(':terminal mouse', function()
   before_each(function()
     clear()
     nvim('set_option', 'statusline', '==========')
-    nvim('command', 'highlight StatusLine cterm=NONE')
-    nvim('command', 'highlight StatusLineNC cterm=NONE')
-    nvim('command', 'highlight VertSplit cterm=NONE')
+    command('highlight StatusLine cterm=NONE')
+    command('highlight StatusLineNC cterm=NONE')
+    command('highlight VertSplit cterm=NONE')
     screen = thelpers.screen_setup()
     local lines = {}
     for i = 1, 30 do
@@ -38,6 +38,26 @@ describe(':terminal mouse', function()
       eq('nt', eval('mode(1)'))
     end)
 
+    it('will exit focus and trigger Normal mode mapping on mouse click', function()
+      command('let g:got_leftmouse = 0')
+      command('nnoremap <LeftMouse> <Cmd>let g:got_leftmouse = 1<CR>')
+      eq('t', eval('mode(1)'))
+      eq(0, eval('g:got_leftmouse'))
+      feed('<LeftMouse>')
+      eq('nt', eval('mode(1)'))
+      eq(1, eval('g:got_leftmouse'))
+    end)
+
+    it('will exit focus and trigger Normal mode mapping on mouse click with modifier', function()
+      command('let g:got_ctrl_leftmouse = 0')
+      command('nnoremap <C-LeftMouse> <Cmd>let g:got_ctrl_leftmouse = 1<CR>')
+      eq('t', eval('mode(1)'))
+      eq(0, eval('g:got_ctrl_leftmouse'))
+      feed('<C-LeftMouse>')
+      eq('nt', eval('mode(1)'))
+      eq(1, eval('g:got_ctrl_leftmouse'))
+    end)
+
     it('will exit focus on <C-\\> + mouse-scroll', function()
       eq('t', eval('mode(1)'))
       feed('<C-\\>')
@@ -180,7 +200,7 @@ describe(':terminal mouse', function()
 
       it('will forward mouse clicks to the program with the correct even if set nu', function()
         if helpers.pending_win32(pending) then return end
-        nvim('command', 'set number')
+        command('set number')
         -- When the display area such as a number is clicked, it returns to the
         -- normal mode.
         feed('<LeftMouse><3,0>')