kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(input): never reinterpret unmapped ALT- chrods in Terminal mode (#16222)

Browse Source
This commit is contained in:
zeertzjq 2021-11-04 21:43:05 +08:00 committed by GitHub
parent fd347840ba
commit 5ce35abae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/getchar.c
View File

@ -1579,7 +1579,8 @@ int vgetc(void)
// If mappings are enabled (i.e., not Ctrl-v) and the user directly typed // If mappings are enabled (i.e., not Ctrl-v) and the user directly typed
// something with a meta- or alt- modifier that was not mapped, interpret // something with a meta- or alt- modifier that was not mapped, interpret
// <M-x> as <Esc>x rather than as an unbound meta keypress. #8213 // <M-x> as <Esc>x rather than as an unbound meta keypress. #8213
if (!no_mapping && KeyTyped // In Terminal mode, however, this is not desirable. #16220
if (!no_mapping && KeyTyped && !(State & TERM_FOCUS)
&& (mod_mask == MOD_MASK_ALT || mod_mask == MOD_MASK_META)) { && (mod_mask == MOD_MASK_ALT || mod_mask == MOD_MASK_META)) {
mod_mask = 0; mod_mask = 0;
ins_char_typebuf(c); ins_char_typebuf(c);

28
test/functional/editor/meta_key_spec.lua
View File

@ -1,6 +1,8 @@
local helpers = require('test.functional.helpers')(after_each) local helpers = require('test.functional.helpers')(after_each)
local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
local command = helpers.command local command = helpers.command
local exec_lua = helpers.exec_lua
local eval = helpers.eval
local expect = helpers.expect local expect = helpers.expect
local funcs = helpers.funcs local funcs = helpers.funcs
local eq = helpers.eq local eq = helpers.eq
@ -61,4 +63,30 @@ describe('meta-keys #8226 #13042', function()
feed('u') feed('u')
expect('hello') expect('hello')
end) end)
it('ALT/META terminal-mode', function()
exec_lua([[
_G.input_data = ''
vim.api.nvim_open_term(0, { on_input = function(_, _, _, data)
_G.input_data = _G.input_data .. vim.fn.strtrans(data)
end })
]])
-- Mapped ALT-chord behaves as mapped.
command('tnoremap <M-l> meta-l')
command('tnoremap <A-j> alt-j')
feed('i<M-l> xxx <A-j>')
eq('meta-l xxx alt-j', exec_lua([[return _G.input_data]]))
-- Unmapped ALT-chord is sent to terminal as-is. #16220
exec_lua([[_G.input_data = '']])
command('tunmap <M-l>')
feed('<M-l>')
local meta_l_seq = exec_lua([[return _G.input_data]])
command('tnoremap <Esc> <C-\\><C-N>')
feed('yyy<M-l><A-j>')
eq(meta_l_seq .. 'yyy' .. meta_l_seq .. 'alt-j', exec_lua([[return _G.input_data]]))
eq('t', eval('mode(1)'))
feed('<Esc>j')
eq({ 0, 2, 1, 0, }, funcs.getpos('.'))
eq('nt', eval('mode(1)'))
end)
end) end)