Use <C-h> and support cmdwin
This commit is contained in:
@@ -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-g>U<Left><Del>', ctx.cursor.character - misc.to_utfindex(e.context.cursor_before_line, e:get_offset()))))
|
||||
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, 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-g>U<Left><Del>', vim.fn.strchars(e:get_word()))))
|
||||
table.insert(restore, keymap.t(string.rep('<C-h>', vim.fn.strchars(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-g>U<Left><Del>', e.context.cursor.character - completion_item.textEdit.range.start.character)))
|
||||
table.insert(keys, keymap.t(string.rep('<C-h>', 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-g>U<Left><Del>', vim.fn.strchars(e:get_word()))))
|
||||
table.insert(keys, keymap.t(string.rep('<C-h>', vim.fn.strchars(e:get_word()))))
|
||||
else
|
||||
table.insert(keys, keymap.t('<C-g>u') .. completion_item.textEdit.newText .. keymap.t('<C-g>u'))
|
||||
end
|
||||
|
||||
@@ -15,6 +15,12 @@ misc.concat = function(list1, list2)
|
||||
return new_list
|
||||
end
|
||||
|
||||
---Return is cmdwin or not.
|
||||
---@return boolean
|
||||
misc.is_cmdwin = function()
|
||||
return vim.fn.getcmdwintype() ~= ''
|
||||
end
|
||||
|
||||
---Get cursor before line
|
||||
---@return string
|
||||
misc.get_cursor_before_line = function()
|
||||
|
||||
@@ -137,11 +137,11 @@ window.update = function(self)
|
||||
end
|
||||
else
|
||||
if self.swin1 and vim.api.nvim_win_is_valid(self.swin1) then
|
||||
vim.api.nvim_win_close(self.swin1, false)
|
||||
vim.api.nvim_win_close(self.swin1, true)
|
||||
self.swin1 = nil
|
||||
end
|
||||
if self.swin2 and vim.api.nvim_win_is_valid(self.swin2) then
|
||||
vim.api.nvim_win_close(self.swin2, false)
|
||||
vim.api.nvim_win_close(self.swin2, true)
|
||||
self.swin2 = nil
|
||||
end
|
||||
end
|
||||
|
||||
@@ -6,6 +6,7 @@ local docs_view = require('cmp.view.docs_view')
|
||||
local custom_entries_view = require('cmp.view.custom_entries_view')
|
||||
local native_entries_view = require('cmp.view.native_entries_view')
|
||||
local ghost_text_view = require('cmp.view.ghost_text_view')
|
||||
local misc = require('cmp.utils.misc')
|
||||
|
||||
---@class cmp.View
|
||||
---@field public event cmp.Event
|
||||
@@ -157,7 +158,7 @@ view._get_entries_view = function(self)
|
||||
self.native_entries_view.event:clear()
|
||||
self.custom_entries_view.event:clear()
|
||||
|
||||
if c.experimental.native_menu then
|
||||
if c.experimental.native_menu or misc.is_cmdwin() then
|
||||
self.native_entries_view.event:on('change', function()
|
||||
self:on_entry_change()
|
||||
end)
|
||||
|
||||
@@ -290,7 +290,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-g>U<Left><Del>', length))
|
||||
return keymap.t(string.rep('<C-h>', length))
|
||||
end)
|
||||
|
||||
return custom_entries_view
|
||||
|
||||
Reference in New Issue
Block a user