leigh/nvim-cmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid expr mapping message (#738)

Browse Source 
* Avoid display message by register mapping

* Escape to json

* Improve tests

* fmt

* lint

* Fix evacuate condition

* Default silent

* fallback mapping should be silent by default

* Support legacy nvim
This commit is contained in:
hrsh7th
2022-01-15 19:18:04 +09:00
committed by GitHub
parent 098182e2c2
commit 008de7eb8a
2 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lua/cmp/utils/keymap_spec.lua
View File

@@ -1,4 +1,3 @@
local feedkeys = require('cmp.utils.feedkeys')
local spec = require('cmp.utils.spec')
local keymap = require('cmp.utils.keymap')
@@ -32,7 +31,7 @@ describe('keymap', function()
assert.are.equal(keymap.to_keymap('|'), '<Bar>')
end)
describe('feedmap', function()
describe('evacuate', function()
before_each(spec.before)
it('expr & register', function()
@@ -40,9 +39,8 @@ describe('keymap', function()
expr = true,
noremap = false,
})
feedkeys.call('i', 'nx', function()
keymap.feed_map(keymap.get_map('i', '('))
end)
local fallback = keymap.evacuate(0, 'i', keymap.get_map('i', '('))
vim.api.nvim_feedkeys('i' .. keymap.t(fallback), 'x', true)
assert.are.same({ '(' }, vim.api.nvim_buf_get_lines(0, 0, -1, true))
end)
@@ -55,9 +53,8 @@ describe('keymap', function()
expr = false,
noremap = false,
})
feedkeys.call('i', 'nx', function()
keymap.feed_map(keymap.get_map('i', '('))
end)
local fallback = keymap.evacuate(0, 'i', keymap.get_map('i', '('))
vim.api.nvim_feedkeys('i' .. keymap.t(fallback), 'x', true)
assert.are.same({ '()' }, vim.api.nvim_buf_get_lines(0, 0, -1, true))
end)
@@ -69,10 +66,8 @@ describe('keymap', function()
expr = true,
noremap = false,
})
feedkeys.call('i', 'n', function()
keymap.feed_map(keymap.get_map('i', '<Tab>'))
end)
feedkeys.call('', 'x')
local fallback = keymap.evacuate(0, 'i', keymap.get_map('i', '<Tab>'))
vim.api.nvim_feedkeys('i' .. keymap.t(fallback), 'x', true)
assert.are.same({ 'foobar' }, vim.api.nvim_buf_get_lines(0, 0, -1, true))
end)
it('false', function()
@@ -80,9 +75,8 @@ describe('keymap', function()
expr = true,
noremap = false,
})
feedkeys.call('i', 'nx', function()
keymap.feed_map(keymap.get_map('i', '<Tab>'))
end)
local fallback = keymap.evacuate(0, 'i', keymap.get_map('i', '<Tab>'))
vim.api.nvim_feedkeys('i' .. keymap.t(fallback), 'x', true)
assert.are.same({ '\taiueo' }, vim.api.nvim_buf_get_lines(0, 0, -1, true))
end)
end)