Use instead of

This commit is contained in:
hrsh7th
2021-10-11 00:43:14 +09:00
parent 67d43ddd59
commit d8e6a865e4
5 changed files with 20 additions and 7 deletions

View File

@@ -306,12 +306,12 @@ core.confirm = function(self, e, option, callback)
-- Simulate `<C-y>` behavior.
local confirm = {}
table.insert(confirm, keymap.t(string.rep('<C-h>', ctx.cursor.character - misc.to_utfindex(e.context.cursor_before_line, e:get_offset()))))
table.insert(confirm, keymap.backspace(ctx.cursor.character - misc.to_utfindex(e.context.cursor_before_line, e:get_offset())))
table.insert(confirm, e:get_word())
keymap.feedkeys(table.concat(confirm, ''), 'nt', function()
-- Restore to the requested state.
local restore = {}
table.insert(restore, keymap.t(string.rep('<C-h>', vim.fn.strchars(e:get_word()))))
table.insert(restore, keymap.backspace(vim.str_utfindex(e:get_word())))
table.insert(restore, string.sub(e.context.cursor_before_line, e:get_offset()))
keymap.feedkeys(table.concat(restore, ''), 'n', function()
--@see https://github.com/microsoft/vscode/blob/main/src/vs/editor/contrib/suggest/suggestController.ts#L334
@@ -363,13 +363,13 @@ core.confirm = function(self, e, option, callback)
table.insert(keys, keymap.t(string.rep('<Del>', completion_item.textEdit.range['end'].character - e.context.cursor.character)))
end
if completion_item.textEdit.range.start.character < e.context.cursor.character then
table.insert(keys, keymap.t(string.rep('<C-h>', e.context.cursor.character - completion_item.textEdit.range.start.character)))
table.insert(keys, keymap.backspace(e.context.cursor.character - completion_item.textEdit.range.start.character))
end
local is_snippet = completion_item.insertTextFormat == types.lsp.InsertTextFormat.Snippet
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(string.rep('<C-h>', vim.fn.strchars(e:get_word()))))
table.insert(keys, keymap.backspace(vim.str_utfindex(e:get_word())))
else
table.insert(keys, keymap.t('<C-g>u') .. completion_item.textEdit.newText .. keymap.t('<C-g>u'))
end

View File

@@ -345,7 +345,7 @@ end
---@return { score: number, matches: table[] }
entry.match = function(self, input)
return self.match_cache:ensure(input, function()
local score, matches
local score, matches, _
score, matches = matcher.match(input, self:get_filter_text(), { self:get_word() })
if self:get_filter_text() ~= self:get_completion_item().label then
_, matches = matcher.match(input, self:get_completion_item().label)

View File

@@ -1,6 +1,5 @@
local context = require('cmp.context')
local config = require('cmp.config')
local matcher = require('cmp.matcher')
local entry = require('cmp.entry')
local debug = require('cmp.utils.debug')
local misc = require('cmp.utils.misc')

View File

@@ -72,6 +72,20 @@ keymap.to_keymap = function(s)
end)
end
---Create backspace keys.
---@param count number
---@return string
keymap.backspace = function(count)
if count <= 0 then
return ''
end
local keys = {}
table.insert(keys, keymap.t('<C-g>U'))
table.insert(keys, keymap.t(string.rep('<Left>', count)))
table.insert(keys, keymap.t(string.rep('<Del>', count)))
return table.concat(keys, '')
end
---Return two key sequence are equal or not.
---@param a string
---@param b string

View File

@@ -296,7 +296,7 @@ end
misc.set(_G, { 'cmp', 'view', 'custom_entries_view', '_insert', 'remove' }, function(offset)
local cursor = vim.api.nvim_win_get_cursor(0)
local length = vim.str_utfindex(string.sub(vim.api.nvim_get_current_line(), offset, cursor[2]))
return keymap.t(string.rep('<C-h>', length))
return keymap.backspace(length)
end)
return custom_entries_view