fix(defaults): don't replace keycodes in Visual search mappings (#31460)

Also remove "silent" to be more consistent with Normal mode search.
This commit is contained in:
zeertzjq 2024-12-05 19:03:58 +08:00 committed by GitHub
parent 6a929b15c9
commit 8323398bc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 70 additions and 2 deletions

View File

@ -49,10 +49,10 @@ do
vim.keymap.set('x', '*', function() vim.keymap.set('x', '*', function()
return _visual_search('/') return _visual_search('/')
end, { desc = ':help v_star-default', expr = true, silent = true }) end, { desc = ':help v_star-default', expr = true, replace_keycodes = false })
vim.keymap.set('x', '#', function() vim.keymap.set('x', '#', function()
return _visual_search('?') return _visual_search('?')
end, { desc = ':help v_#-default', expr = true, silent = true }) end, { desc = ':help v_#-default', expr = true, replace_keycodes = false })
end end
--- Map Y to y$. This mimics the behavior of D and C. See |Y-default| --- Map Y to y$. This mimics the behavior of D and C. See |Y-default|

View File

@ -94,6 +94,74 @@ describe('default', function()
end) end)
describe('key mappings', function() describe('key mappings', function()
describe('Visual mode search mappings', function()
it('handle various chars properly', function()
n.clear({ args_rm = { '--cmd' } })
local screen = Screen.new(60, 8)
screen:set_default_attr_ids({
[1] = { foreground = Screen.colors.NvimDarkGray4 },
[2] = {
foreground = Screen.colors.NvimDarkGray3,
background = Screen.colors.NvimLightGray3,
},
[3] = {
foreground = Screen.colors.NvimLightGrey1,
background = Screen.colors.NvimDarkYellow,
},
[4] = {
foreground = Screen.colors.NvimDarkGrey1,
background = Screen.colors.NvimLightYellow,
},
})
n.api.nvim_buf_set_lines(0, 0, -1, true, {
[[testing <CR> /?\!1]],
[[testing <CR> /?\!2]],
[[testing <CR> /?\!3]],
[[testing <CR> /?\!4]],
})
n.feed('gg0vf!o*')
screen:expect([[
{3:testing <CR> /?\!}1 |
{4:^testing <CR> /?\!}2 |
{3:testing <CR> /?\!}3 |
{3:testing <CR> /?\!}4 |
{1:~ }|*2
{2:[No Name] [+] 2,1 All}|
/\Vtesting <CR> \/?\\! [2/4] |
]])
n.feed('n')
screen:expect([[
{3:testing <CR> /?\!}1 |
{3:testing <CR> /?\!}2 |
{4:^testing <CR> /?\!}3 |
{3:testing <CR> /?\!}4 |
{1:~ }|*2
{2:[No Name] [+] 3,1 All}|
/\Vtesting <CR> \/?\\! [3/4] |
]])
n.feed('G0vf!o#')
screen:expect([[
{3:testing <CR> /?\!}1 |
{3:testing <CR> /?\!}2 |
{4:^testing <CR> /?\!}3 |
{3:testing <CR> /?\!}4 |
{1:~ }|*2
{2:[No Name] [+] 3,1 All}|
?\Vtesting <CR> /?\\! [3/4] |
]])
n.feed('n')
screen:expect([[
{3:testing <CR> /?\!}1 |
{4:^testing <CR> /?\!}2 |
{3:testing <CR> /?\!}3 |
{3:testing <CR> /?\!}4 |
{1:~ }|*2
{2:[No Name] [+] 2,1 All}|
?\Vtesting <CR> /?\\! [2/4] |
]])
end)
end)
describe('unimpaired-style mappings', function() describe('unimpaired-style mappings', function()
it('show the command ouptut when successful', function() it('show the command ouptut when successful', function()
n.clear({ args_rm = { '--cmd' } }) n.clear({ args_rm = { '--cmd' } })