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

Support vim-endwise

Browse Source
This commit is contained in:
hrsh7th
2021-09-08 19:25:02 +09:00
parent fa031530ed
commit 8f559af081
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lua/cmp/core.lua
View File

@@ -296,7 +296,7 @@ core.confirm = function(e, option, callback)
table.insert(confirm, e:get_word()) table.insert(confirm, e:get_word())
keymap.feedkeys(table.concat(confirm, ''), 'nt', function() keymap.feedkeys(table.concat(confirm, ''), 'nt', function()
local restore = {} local restore = {}
table.insert(restore, keymap.t(string.rep('<BS>', vim.fn.strchars(e:get_word())))) table.insert(restore, keymap.t(string.rep('<C-g>U<Left><Del>', vim.fn.strchars(e:get_word()))))
table.insert(restore, string.sub(e.context.cursor_before_line, e:get_offset())) table.insert(restore, string.sub(e.context.cursor_before_line, e:get_offset()))
keymap.feedkeys(table.concat(restore, ''), 'n', function() keymap.feedkeys(table.concat(restore, ''), 'n', function()
--@see https://github.com/microsoft/vscode/blob/main/src/vs/editor/contrib/suggest/suggestController.ts#L334 --@see https://github.com/microsoft/vscode/blob/main/src/vs/editor/contrib/suggest/suggestController.ts#L334
@@ -347,6 +347,7 @@ core.confirm = function(e, option, callback)
local keys = {} local keys = {}
if e.context.cursor.character < completion_item.textEdit.range['end'].character then if e.context.cursor.character < completion_item.textEdit.range['end'].character then
print(completion_item.textEdit.range['end'].character - e.context.cursor.character)
table.insert(keys, keymap.t(string.rep('<Del>', completion_item.textEdit.range['end'].character - e.context.cursor.character))) table.insert(keys, keymap.t(string.rep('<Del>', completion_item.textEdit.range['end'].character - e.context.cursor.character)))
end end
if completion_item.textEdit.range.start.character < e.context.cursor.character then if completion_item.textEdit.range.start.character < e.context.cursor.character then
@@ -355,7 +356,7 @@ core.confirm = function(e, option, callback)
if is_snippet then if is_snippet then
table.insert(keys, keymap.t('<C-g>u') .. e:get_word() .. keymap.t('<C-g>u')) table.insert(keys, keymap.t('<C-g>u') .. e:get_word() .. keymap.t('<C-g>u'))
table.insert(keys, keymap.t(string.rep('<BS>', vim.fn.strchars(e:get_word())))) table.insert(keys, keymap.t(string.rep('<C-g>U<Left><Del>', vim.fn.strchars(e:get_word()))))
else else
table.insert(keys, keymap.t('<C-g>u') .. completion_item.textEdit.newText .. keymap.t('<C-g>u')) table.insert(keys, keymap.t('<C-g>u') .. completion_item.textEdit.newText .. keymap.t('<C-g>u'))
end end

26
lua/cmp/utils/keymap.lua
View File

@@ -57,6 +57,7 @@ keymap.feedkeys = setmetatable({
if #keys ~= 0 then if #keys ~= 0 then
vim.api.nvim_feedkeys(keys, mode, true) vim.api.nvim_feedkeys(keys, mode, true)
end end
if callback then if callback then
if vim.fn.reg_recording() == '' then if vim.fn.reg_recording() == '' then
local id = misc.id('cmp.utils.keymap.feedkeys') local id = misc.id('cmp.utils.keymap.feedkeys')
@@ -141,13 +142,24 @@ misc.set(_G, { 'cmp', 'utils', 'keymap', 'listen', 'run' }, function(mode, keys)
local existing = keymap.listen.cache:get({ mode, bufnr, keys }).existing local existing = keymap.listen.cache:get({ mode, bufnr, keys }).existing
local callback = keymap.listen.cache:get({ mode, bufnr, keys }).callback local callback = keymap.listen.cache:get({ mode, bufnr, keys }).callback
callback(keys, function() callback(keys, function()
vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:_)', existing.rhs, { if existing.expr == 1 or existing.script == 1 then
expr = existing.expr ~= 0, vim.api.nvim_buf_set_keymap(0, mode, '<Plug>(cmp-utils-keymap-listen-run:_)', existing.rhs, {
noremap = existing.noremap ~= 0, expr = existing.expr ~= 0,
script = existing.script ~= 0, noremap = existing.noremap ~= 0,
silent = true, script = existing.script ~= 0,
}) silent = true,
vim.fn.feedkeys(keymap.t('<Plug>(cmp-utils-keymap-listen-run:_)'), '') })
keymap.feedkeys(keymap.t('<Plug>(cmp-utils-keymap-listen-run:_)'), '')
elseif existing.noremap == 1 then
keymap.feedkeys(keymap.t(keys), 'n')
else
for i, keys_ in ipairs(vim.split(existing.rhs, existing.lhs, true)) do
if i ~= 1 then
keymap.feedkeys(keymap.t(existing.lhs), 'n')
end
keymap.feedkeys(keymap.t(keys_), '')
end
end
end) end)
return keymap.t('<Ignore>') return keymap.t('<Ignore>')
end) end)