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

Fix #1276

Browse Source
This commit is contained in:
hrsh7th
2022-11-10 21:58:39 +09:00
parent 16ec8c6b12
commit 11839571ab
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lua/cmp/core.lua
View File

@@ -125,7 +125,7 @@ core.on_keymap = function(self, keys, fallback)
}, function() }, function()
local ctx = self:get_context() local ctx = self:get_context()
local word = e:get_word() local word = e:get_word()
if string.sub(ctx.cursor_before_line, -#word, ctx.cursor.col - 1) == word and is_printable then if string.sub(ctx.cursor_before_line, - #word, ctx.cursor.col - 1) == word and is_printable then
fallback() fallback()
else else
self:reset() self:reset()
@@ -221,7 +221,7 @@ end
---Complete common string for current completed entries. ---Complete common string for current completed entries.
core.complete_common_string = function(self) core.complete_common_string = function(self)
if not self.view:visible() or self.view:get_active_entry() then if not self.view:visible() or self.view:get_selected_entry() then
return false return false
end end
@@ -250,8 +250,10 @@ core.complete_common_string = function(self)
common_string = str.get_common_string(common_string, vim_item.word) common_string = str.get_common_string(common_string, vim_item.word)
end end
end end
if common_string and #common_string > (1 + cursor[2] - offset) then local cursor_before_line = api.get_cursor_before_line()
feedkeys.call(keymap.backspace(string.sub(api.get_current_line(), offset, cursor[2])) .. common_string, 'n') local pretext = cursor_before_line:sub(offset)
if common_string and #common_string > #pretext then
feedkeys.call(keymap.backspace(pretext) .. common_string, 'n')
return true return true
end end
return false return false
@@ -415,7 +417,8 @@ core.confirm = function(self, e, option, callback)
local completion_item = misc.copy(e:get_completion_item()) local completion_item = misc.copy(e:get_completion_item())
if not misc.safe(completion_item.textEdit) then if not misc.safe(completion_item.textEdit) then
completion_item.textEdit = {} completion_item.textEdit = {}
completion_item.textEdit.newText = misc.safe(completion_item.insertText) or completion_item.word or completion_item.label completion_item.textEdit.newText = misc.safe(completion_item.insertText) or completion_item.word or
completion_item.label
end end
local behavior = option.behavior or config.get().confirmation.default_behavior local behavior = option.behavior or config.get().confirmation.default_behavior
if behavior == types.cmp.ConfirmBehavior.Replace then if behavior == types.cmp.ConfirmBehavior.Replace then