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

Fix #52

Browse Source
This commit is contained in:
hrsh7th
2021-08-25 03:21:18 +09:00
parent 0d97bfc875
commit 3862af1474
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lua/cmp/core.lua
View File

@@ -196,7 +196,7 @@ core.confirm = vim.schedule_wrap(function(e, option, callback)
debug.log('entry.confirm', e) debug.log('entry.confirm', e)
local ctx = context.new() local ctx = context.new()
keymap.feedkeys('<C-g>U' .. string.rep('<BS>', ctx.cursor.col - e.context.cursor.col), 'n', function() keymap.feedkeys(keymap.t('<C-g>U' .. string.rep('<BS>', ctx.cursor.col - e.context.cursor.col)), '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
if #(misc.safe(e:get_completion_item().additionalTextEdits) or {}) == 0 then if #(misc.safe(e:get_completion_item().additionalTextEdits) or {}) == 0 then
local pre = context.new() local pre = context.new()
@@ -245,21 +245,21 @@ core.confirm = vim.schedule_wrap(function(e, option, callback)
is_snippet = is_snippet and completion_item.insertTextFormat == types.lsp.InsertTextFormat.Snippet is_snippet = is_snippet and completion_item.insertTextFormat == types.lsp.InsertTextFormat.Snippet
is_snippet = is_snippet and vim.lsp.util.parse_snippet(completion_item.textEdit.newText) ~= completion_item.textEdit.newText is_snippet = is_snippet and vim.lsp.util.parse_snippet(completion_item.textEdit.newText) ~= completion_item.textEdit.newText
local keys = '' local keys = {}
if completion_item.textEdit.range['end'].character > e.context.cursor.character then if completion_item.textEdit.range['end'].character > e.context.cursor.character then
keys = keys .. string.rep('<C-g>U<Right><BS>', completion_item.textEdit.range['end'].character - e.context.cursor.character) table.insert(keys, keymap.t(string.rep('<C-g>U<Right><BS>', completion_item.textEdit.range['end'].character - e.context.cursor.character)))
end end
if e.context.cursor.character > completion_item.textEdit.range.start.character then if e.context.cursor.character > completion_item.textEdit.range.start.character then
keys = keys .. string.rep('<BS>', e.context.cursor.character - completion_item.textEdit.range.start.character) table.insert(keys, keymap.t(string.rep('<BS>', e.context.cursor.character - completion_item.textEdit.range.start.character)))
end end
if is_snippet then if is_snippet then
keys = keys .. '<C-g>u' .. e:get_word() .. '<C-g>u' table.insert(keys, keymap.t('<C-g>u') .. e:get_word() .. keymap.t('<C-g>u'))
keys = keys .. string.rep('<BS>', vim.fn.strchars(e:get_word())) table.insert(keys, keymap.t(string.rep('<BS>', vim.fn.strchars(e:get_word()))))
else else
keys = keys .. '<C-g>u' .. completion_item.textEdit.newText .. '<C-g>u' table.insert(keys, keymap.t('<C-g>u') .. completion_item.textEdit.newText .. keymap.t('<C-g>u'))
end end
keymap.feedkeys(keys, 'n', function() keymap.feedkeys(table.concat(keys, ''), 'n', function()
if is_snippet then if is_snippet then
config.get().snippet.expand({ config.get().snippet.expand({
body = completion_item.textEdit.newText, body = completion_item.textEdit.newText,

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

@@ -54,7 +54,7 @@ keymap.feedkeys = setmetatable({
}, { }, {
__call = function(self, keys, mode, callback) __call = function(self, keys, mode, callback)
if #keys ~= 0 then if #keys ~= 0 then
vim.fn.feedkeys(keymap.t(keys), mode) vim.fn.feedkeys(keys, mode)
end end
if callback then if callback then